Merge branch 'bug-1392' into release
authorBenny Baumann <BenBE@geshi.org>
Sat, 25 Jul 2015 12:56:13 +0000 (14:56 +0200)
committerBenny Baumann <BenBE@geshi.org>
Sat, 25 Jul 2015 12:56:13 +0000 (14:56 +0200)

Trivial merge