Merge branch 'bug-1383' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sat, 9 May 2015 20:51:02 +0000 (22:51 +0200)
committerBenny Baumann <BenBE@geshi.org>
Sat, 9 May 2015 20:51:02 +0000 (22:51 +0200)

Trivial merge