Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 2 Sep 2014 18:02:11 +0000 (20:02 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 2 Sep 2014 18:02:11 +0000 (20:02 +0200)

Trivial merge