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

Trivial merge