Merge branch 'master' of orgmode.org:org-mode
commit0f799373b2c946b78f6ae08964aa8c0074e9a3c5
authorBastien Guerry <bzg@altern.org>
Wed, 7 Mar 2012 08:05:44 +0000 (7 09:05 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 7 Mar 2012 08:05:44 +0000 (7 09:05 +0100)
treec6954b4b54f028652cc269c2e696e016c4e3929c
parent32947c0eed7820892c77834a0de46b5850a71e31
parentd2bcc61001cc60c5d2cc7626b99b2de4c4cbe45d
Merge branch 'master' of orgmode.org:org-mode