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

Trivial merge