Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sat, 3 Jan 2015 20:55:38 +0000 (21:55 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sat, 3 Jan 2015 20:55:38 +0000 (21:55 +0100)

Trivial merge