Merge branch 'bug-1042' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 19:52:49 +0000 (21:52 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 19:52:49 +0000 (21:52 +0200)

Trivial merge