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

Trivial merge