Merge branch 'bug-1304' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Wed, 10 Sep 2014 21:01:25 +0000 (23:01 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 10 Sep 2014 21:01:25 +0000 (23:01 +0200)

Trivial merge