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

Trivial merge