Merge branch 'bug-1341' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 11 Mar 2015 22:31:09 +0000 (23:31 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 11 Mar 2015 22:31:09 +0000 (23:31 +0100)

Trivial merge