Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 8 May 2015 18:11:28 +0000 (20:11 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 8 May 2015 18:11:28 +0000 (20:11 +0200)

Trivial merge