Merge branch 'bug-1304' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Wed, 15 Oct 2014 16:46:50 +0000 (18:46 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 15 Oct 2014 16:46:50 +0000 (18:46 +0200)

Trivial merge