Merge branch 'bug-1192' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 30 Sep 2014 20:09:42 +0000 (22:09 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 30 Sep 2014 20:09:42 +0000 (22:09 +0200)

Trivial merge