Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 31 Dec 2013 20:36:38 +0000 (21:36 +0100)
committerMarcel Werk <burntime@woltlab.com>
Tue, 31 Dec 2013 20:36:38 +0000 (21:36 +0100)

Trivial merge