Merge branch 'bug-1034' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 16 Jan 2013 02:38:31 +0000 (03:38 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 16 Jan 2013 02:38:31 +0000 (03:38 +0100)

Trivial merge