Merge branch 'release' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Wed, 17 Sep 2014 06:58:17 +0000 (08:58 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 17 Sep 2014 06:58:17 +0000 (08:58 +0200)

Trivial merge