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

Trivial merge