Merge branch 'bug-512' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 16 Jan 2013 04:03:11 +0000 (05:03 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 16 Jan 2013 04:03:11 +0000 (05:03 +0100)

Trivial merge