Merge branch 'master' of orgmode.org:org-mode
commit735bf5cd05c970d08aaecf800973f59a39dea7fb
authorBastien Guerry <bzg@altern.org>
Fri, 28 Oct 2011 09:18:21 +0000 (28 11:18 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 28 Oct 2011 09:18:21 +0000 (28 11:18 +0200)
tree34ea8536c000633e12d721dd7f1d6b21411e65cb
parent901121ac4597e18ab19087fdb210b6a7a6951b85
parentca49e893ab03e8f6c8a494be6d830bd77d815ad6
Merge branch 'master' of orgmode.org:org-mode