Merge branch 'master' of orgmode.org:org-mode
commit7c489ff0f533e8ec33da77b48bfa68e2d9c146bf
authorBastien Guerry <bzg@altern.org>
Sun, 13 Feb 2011 11:16:03 +0000 (13 12:16 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 13 Feb 2011 11:16:03 +0000 (13 12:16 +0100)
tree2a0cdee1b7aeb25c844aa8781b8aadb1554575d9
parente409a59dfaaf671c9738e7be3a51852a6dcfb04e
parent1d1368e142601896b13245b733a2bcf80ca6dc51
Merge branch 'master' of orgmode.org:org-mode