Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 27 Dec 2013 21:39:21 +0000 (22:39 +0100)
committerMarcel Werk <burntime@woltlab.com>
Fri, 27 Dec 2013 21:39:21 +0000 (22:39 +0100)

Trivial merge