Merge branch 'bug-1061' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Wed, 21 Jan 2015 22:05:49 +0000 (23:05 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 21 Jan 2015 22:05:49 +0000 (23:05 +0100)

Trivial merge