Merge branch 'master' of orgmode.org:org-mode
authorBastien Guerry <bzg@altern.org>
Mon, 14 Jan 2013 08:36:00 +0000 (09:36 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 14 Jan 2013 08:36:00 +0000 (09:36 +0100)

Trivial merge