Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 28 Apr 2015 13:34:40 +0000 (15:34 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 28 Apr 2015 13:34:40 +0000 (15:34 +0200)

Trivial merge