Merge branch 'master' of orgmode.org:org-mode
commita359627775f67cd8c26e617e63be13538500feea
authorBastien Guerry <bzg@altern.org>
Sat, 19 Apr 2014 12:27:27 +0000 (19 14:27 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 19 Apr 2014 12:27:27 +0000 (19 14:27 +0200)
treebac479a999144eefad1d333827e00fe3f22e2553
parent9dd664c27edab1a4ba8155e6d81d9b2db6282047
parent06c9478ebcc281cf966c1c0fe4181d7aab1a0196
Merge branch 'master' of orgmode.org:org-mode