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

Trivial merge