Merge branch 'master' of orgmode.org:org-mode
authorBastien Guerry <bzg@altern.org>
Thu, 10 Jan 2013 13:37:58 +0000 (14:37 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 10 Jan 2013 13:37:58 +0000 (14:37 +0100)

Trivial merge