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

Trivial merge