Merge branch 'bug-1392' into release
authorBenny Baumann <BenBE@geshi.org>
Sun, 26 Jul 2015 21:49:06 +0000 (23:49 +0200)
committerBenny Baumann <BenBE@geshi.org>
Sun, 26 Jul 2015 21:49:06 +0000 (23:49 +0200)

Trivial merge