Merge branch 'bug-1091' into release
authorBenny Baumann <BenBE@geshi.org>
Thu, 11 Oct 2012 11:34:39 +0000 (13:34 +0200)
committerBenny Baumann <BenBE@geshi.org>
Thu, 11 Oct 2012 11:34:39 +0000 (13:34 +0200)

Trivial merge