Merge branch 'master' of orgmode.org:org-mode
commitfacff6f605ba303ae6a5a145b671187d5beb1cee
authorBastien Guerry <bzg@altern.org>
Mon, 25 Aug 2014 04:06:47 +0000 (25 06:06 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 25 Aug 2014 04:06:47 +0000 (25 06:06 +0200)
tree14d997b48b32169bbb6dca3677c989246943010d
parentcad24004435436f9919e4fb3372140901d7f0ef5
parent4dd9f392c1b5ff5050e0f7a136aae546420267ba
Merge branch 'master' of orgmode.org:org-mode