Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 8 Apr 2015 12:24:49 +0000 (14:24 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 8 Apr 2015 12:24:49 +0000 (14:24 +0200)

Trivial merge