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

Trivial merge