Merge branch 'master' of orgmode.org:org-mode
authorBastien Guerry <bzg@altern.org>
Wed, 24 Apr 2013 09:25:28 +0000 (11:25 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 24 Apr 2013 09:25:28 +0000 (11:25 +0200)

Trivial merge