Merge branch 'bug-1389' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 26 Aug 2015 06:27:52 +0000 (08:27 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 26 Aug 2015 06:27:52 +0000 (08:27 +0200)

Trivial merge