Merge branch 'bug-1357' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 13 Jan 2015 20:55:30 +0000 (21:55 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 13 Jan 2015 20:55:30 +0000 (21:55 +0100)

Trivial merge