Merge branch 'master' of orgmode.org:org-mode
commiteb787638e8784e4f4db3e7bc8a997bc66fb7353f
authorBastien Guerry <bzg@altern.org>
Wed, 27 Aug 2014 12:39:47 +0000 (27 14:39 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 27 Aug 2014 12:39:47 +0000 (27 14:39 +0200)
tree0db48f54a80efcb450697b11f764fb7cc358cee4
parent671a01c7657145f5a926127fc474539ea618be4e
parentef5ec3d536710bd6c99ec03f643d0934c133ba74
Merge branch 'master' of orgmode.org:org-mode