Merge branch 'master' of orgmode.org:org-mode
commit50412d29c5f34afbe76e3b4aa147c7f3399857d8
authorBastien Guerry <bzg@altern.org>
Thu, 25 Aug 2011 07:39:38 +0000 (25 09:39 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 25 Aug 2011 07:39:38 +0000 (25 09:39 +0200)
tree2860a6c595ef2ac67b8a4fdddbe32d2a5c19d34e
parenteabea0ef852934677499b8b07c0097a4405d4017
parentbe25be1c8d25151de38d8c3e01a6c5be515129c1
Merge branch 'master' of orgmode.org:org-mode