Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 16 Jan 2015 00:28:03 +0000 (01:28 +0100)
committerMarcel Werk <burntime@woltlab.com>
Fri, 16 Jan 2015 00:28:03 +0000 (01:28 +0100)

Trivial merge