Merge branch 'bug-1165' into release
authorBenny Baumann <BenBE@geshi.org>
Mon, 13 May 2013 17:51:07 +0000 (19:51 +0200)
committerBenny Baumann <BenBE@geshi.org>
Mon, 13 May 2013 17:51:07 +0000 (19:51 +0200)

Trivial merge