Merge branch 'bug-1131' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 16 Dec 2014 20:08:37 +0000 (21:08 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 16 Dec 2014 20:08:37 +0000 (21:08 +0100)

Trivial merge