Merge branch 'bug-1118' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 15 Jan 2013 23:11:59 +0000 (00:11 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 15 Jan 2013 23:11:59 +0000 (00:11 +0100)

Trivial merge