Merge branch 'bug-1131' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 23 Sep 2014 21:18:54 +0000 (23:18 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 23 Sep 2014 21:18:54 +0000 (23:18 +0200)

Trivial merge