Merge branch 'bug-1343' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sat, 13 Dec 2014 19:33:18 +0000 (20:33 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sat, 13 Dec 2014 19:33:18 +0000 (20:33 +0100)

Trivial merge