Merge branch 'bug-1131' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 16 Sep 2014 20:17:41 +0000 (22:17 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 16 Sep 2014 20:17:41 +0000 (22:17 +0200)

Trivial merge