Merge branch 'bug-1354' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sat, 3 Jan 2015 02:04:40 +0000 (03:04 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sat, 3 Jan 2015 02:04:40 +0000 (03:04 +0100)

Trivial merge