Merge branch 'master' of orgmode.org:org-mode
authorDavid Maus <dmaus@ictsoc.de>
Wed, 23 Nov 2011 20:35:47 +0000 (21:35 +0100)
committerDavid Maus <dmaus@ictsoc.de>
Wed, 23 Nov 2011 20:35:47 +0000 (21:35 +0100)

Trivial merge