Merge branch 'master' of orgmode.org:org-mode
commitb8a17b7af2d428c5cf81a70ecb1baee1a748167a
authorBastien Guerry <bzg@altern.org>
Wed, 2 Mar 2011 17:44:14 +0000 (2 18:44 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 2 Mar 2011 17:44:14 +0000 (2 18:44 +0100)
tree862396d3cdb7c987b3f507a325c3cea180d4a344
parent35ba10c0af920b61238854c9892154051fd31473
parent8237c9ae6d587a22646333e0315683675e2db538
Merge branch 'master' of orgmode.org:org-mode