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

Trivial merge