Merge branch 'master' of orgmode.org:org-mode
authorBastien Guerry <bzg@altern.org>
Sun, 24 Jul 2011 22:55:18 +0000 (00:55 +0200)
committerBastien Guerry <bzg@altern.org>
Sun, 24 Jul 2011 22:55:18 +0000 (00:55 +0200)

Trivial merge