Merge branch 'bug-1391'
authorBenny Baumann <BenBE@geshi.org>
Fri, 31 Jul 2015 06:54:58 +0000 (08:54 +0200)
committerBenny Baumann <BenBE@geshi.org>
Fri, 31 Jul 2015 06:54:58 +0000 (08:54 +0200)

Trivial merge