Merge branch 'bug-1391'
authorBenny Baumann <BenBE@geshi.org>
Tue, 28 Jul 2015 20:37:58 +0000 (22:37 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 28 Jul 2015 20:37:58 +0000 (22:37 +0200)

Trivial merge