Merge branch 'bug-1069' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 16 Jan 2013 00:23:32 +0000 (01:23 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 16 Jan 2013 00:23:32 +0000 (01:23 +0100)

Trivial merge