Merge branch 'bug-1298' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 20 Aug 2014 20:34:10 +0000 (22:34 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 20 Aug 2014 20:34:10 +0000 (22:34 +0200)

Trivial merge