Merge branch 'master' of orgmode.org:org-mode
authorBastien Guerry <bzg@altern.org>
Tue, 26 Mar 2013 15:00:56 +0000 (16:00 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 26 Mar 2013 15:00:56 +0000 (16:00 +0100)

Trivial merge