Merge branch 'bug-1042' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 12 May 2015 21:50:31 +0000 (23:50 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 12 May 2015 21:50:31 +0000 (23:50 +0200)

Trivial merge