Merge branch 'master' of orgmode.org:org-mode
commit814b767608eaad1872ee59cff31cc39f0b7f79b1
authorBastien Guerry <bzg@altern.org>
Sat, 9 Apr 2011 12:21:51 +0000 (9 14:21 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 9 Apr 2011 12:21:51 +0000 (9 14:21 +0200)
tree653e98264268fc3476e38fccd366a8adcc25da50
parentaaad53f50a5c412ab813d2c84d6e4f87cf86ab03
parentabad1b499471150604e4c0bec20369d8e089c3e4
Merge branch 'master' of orgmode.org:org-mode