Merge branch 'master' of orgmode.org:org-mode
commit37557ef1031b33c64cd0f1112b3c4d37d12ca70f
authorBastien Guerry <bzg@altern.org>
Wed, 11 Apr 2012 08:27:42 +0000 (11 10:27 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 11 Apr 2012 08:27:42 +0000 (11 10:27 +0200)
treeff9c3cf9f39664fd607c663481fa2864e6d262fc
parentc815eca7ad730cff28edf77118564f5d0be9c720
parent718fefa4e3941bf3025482124d7f454ba2305f27
Merge branch 'master' of orgmode.org:org-mode