Merge branch 'master' of orgmode.org:org-mode
commit0652a10bf3cce40242e0787a0dab87bfebbcb690
authorBastien Guerry <bzg@altern.org>
Wed, 8 Jan 2014 23:03:06 +0000 (9 00:03 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 8 Jan 2014 23:03:06 +0000 (9 00:03 +0100)
tree6f4a56c0481d39218b94f8a2f9c7c0b98fff95ce
parent248bc714b595cd8982599c8c1b6d6befd9167eff
parent87234bee559039197d791febcaac2155a7fb4304
Merge branch 'master' of orgmode.org:org-mode