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

Trivial merge