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

Trivial merge