Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 2 Apr 2015 21:32:21 +0000 (23:32 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 2 Apr 2015 21:32:21 +0000 (23:32 +0200)

Trivial merge