Merge branch 'release' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Wed, 31 Dec 2014 15:44:12 +0000 (16:44 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 31 Dec 2014 15:44:12 +0000 (16:44 +0100)

Trivial merge