Merge branch 'release' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Wed, 11 Mar 2015 20:15:47 +0000 (21:15 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 11 Mar 2015 20:15:47 +0000 (21:15 +0100)

No differences found