Merge branch 'bug-1291' into release
authorBenny Baumann <BenBE@geshi.org>
Sat, 9 Aug 2014 08:56:14 +0000 (10:56 +0200)
committerBenny Baumann <BenBE@geshi.org>
Sat, 9 Aug 2014 08:56:14 +0000 (10:56 +0200)

Trivial merge