Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sun, 26 Apr 2015 15:20:35 +0000 (17:20 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sun, 26 Apr 2015 15:20:35 +0000 (17:20 +0200)

Trivial merge