Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 15 Jan 2014 22:30:58 +0000 (23:30 +0100)
committerMarcel Werk <burntime@woltlab.com>
Wed, 15 Jan 2014 22:30:58 +0000 (23:30 +0100)

Trivial merge