Merge branch 'master' of orgmode.org:org-mode
commit1109d35d4f9b0301f013fe7e9fbeb3f34ddbaeb3
authorBastien Guerry <bzg@altern.org>
Thu, 17 Apr 2014 16:13:50 +0000 (17 18:13 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 17 Apr 2014 16:13:50 +0000 (17 18:13 +0200)
tree3a6b8f3204d6439886e049a074f15ff0adf0b4ff
parent28131ee94a95d923c6797eb7fdfd2016605fd72d
parent56483ad1739b52c2abdd6d1a677bb155b4e5a37d
Merge branch 'master' of orgmode.org:org-mode