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

Trivial merge