Merge branch 'bug-1302' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 9 Sep 2014 22:06:09 +0000 (00:06 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 9 Sep 2014 22:06:09 +0000 (00:06 +0200)

Trivial merge