Merge branch 'bug-1354' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Fri, 2 Jan 2015 17:43:07 +0000 (18:43 +0100)
committerBenny Baumann <BenBE@geshi.org>
Fri, 2 Jan 2015 17:43:07 +0000 (18:43 +0100)

Trivial merge