Merge branch 'bug-1355' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 20 Jan 2015 23:27:55 +0000 (00:27 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 20 Jan 2015 23:27:55 +0000 (00:27 +0100)

Trivial merge