Merge branch 'master' of orgmode.org:org-mode
commitf9d864435d1a46c560c73a19efac2443dc066bb8
authorBastien Guerry <bzg@altern.org>
Wed, 7 Mar 2012 17:24:21 +0000 (7 18:24 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 7 Mar 2012 17:24:21 +0000 (7 18:24 +0100)
treeff0d1e1e116d5fd90919c1a3655a5a84f58bd229
parent0f799373b2c946b78f6ae08964aa8c0074e9a3c5
parent62a631e236131092ad257ab993aa1e38f6f8a241
Merge branch 'master' of orgmode.org:org-mode