Merge branch 'master' of orgmode.org:org-mode
commit4c2ad5f87cfea5a722d60b737b858e1559c7697d
authorBastien Guerry <bzg@altern.org>
Wed, 12 Jan 2011 08:13:22 +0000 (12 09:13 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 12 Jan 2011 08:13:22 +0000 (12 09:13 +0100)
tree62b1299c96bf6b8cb3812df66964983ce04417f3
parent38953882e12a5abcdc80a904543cb4bb81ec60c5
parentf7a752f6d60e1c747dc9330c5f12631bf77f6aa3
Merge branch 'master' of orgmode.org:org-mode