Merge branch 'master' of orgmode.org:org-mode
commitcdccf1f15bfe4e1ec567b50c40412dc0b37400c9
authorBastien Guerry <bzg@altern.org>
Mon, 1 Sep 2014 05:07:37 +0000 (1 07:07 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 1 Sep 2014 05:07:37 +0000 (1 07:07 +0200)
tree0e25a5271f8f4ad709a3d429d8ecada3594a9b77
parent5ac96a45038033070d77230ed64511c0f8064076
parenta4a1d85ed0d62e7713d515b967b1bc1580ec398d
Merge branch 'master' of orgmode.org:org-mode