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

Trivial merge