Merge branch 'bug-1382' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 20:29:37 +0000 (22:29 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 20:29:37 +0000 (22:29 +0200)

Trivial merge