Merge branch 'bug-1354' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Fri, 2 Jan 2015 14:06:25 +0000 (15:06 +0100)
committerBenny Baumann <BenBE@geshi.org>
Fri, 2 Jan 2015 14:06:25 +0000 (15:06 +0100)

Trivial merge