Merge branch 'master' of orgmode.org:org-mode
commitfaabe2f1eb58d8c9de0150ce36012fe5b95243d2
authorBastien Guerry <bzg@altern.org>
Fri, 5 Jul 2013 12:31:04 +0000 (5 14:31 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 5 Jul 2013 12:31:04 +0000 (5 14:31 +0200)
treeb3af5ce8262b5659c9e62b4d63636089d32e619f
parent2629b767b1ead75cf74da7361757c80f323eea8f
parent240f60b3bc44d3a31e34747f7fe3e89eb15286b4
Merge branch 'master' of orgmode.org:org-mode