Merge branch 'master' of orgmode.org:org-mode
authorBastien Guerry <bzg@altern.org>
Mon, 25 Mar 2013 14:54:42 +0000 (25 15:54 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 25 Mar 2013 14:54:42 +0000 (25 15:54 +0100)

Trivial merge