Merge branch 'master' of orgmode.org:org-mode
commitffa0b1b1b4ecb6304b86da18b352768939650a4d
authorBastien Guerry <bzg@altern.org>
Tue, 2 Sep 2014 21:34:12 +0000 (2 23:34 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 2 Sep 2014 21:34:12 +0000 (2 23:34 +0200)
treed0ba7904d8c6e74b177ff80b815e5097a67b0f86
parentbfab7af1627efcf51ed195a34061f838a938c6cb
parent38d0eb64b061a2e555c6b0cf877e207e015a17d4
Merge branch 'master' of orgmode.org:org-mode