Merge branch 'bug-1083' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 31 Oct 2012 17:50:11 +0000 (18:50 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 31 Oct 2012 17:50:11 +0000 (18:50 +0100)

Trivial merge