Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sat, 10 Jan 2015 22:50:22 +0000 (23:50 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sat, 10 Jan 2015 22:50:22 +0000 (23:50 +0100)

Trivial merge