Merge branch 'master' of orgmode.org:org-mode
commit74c027a741921746c26e9331f9a93f06ff6a05e1
authorBastien Guerry <bzg@altern.org>
Sat, 29 Sep 2012 05:10:33 +0000 (29 07:10 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 29 Sep 2012 05:10:33 +0000 (29 07:10 +0200)
tree7da3105ce3efc599a6b4f44f4556a4d939609ec0
parent40fdea9b0d9d47aaabc9037ee91039853d177715
parente5488204f3252a0d3465c939cf678a577bde9720
Merge branch 'master' of orgmode.org:org-mode