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

Trivial merge