Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 11 Dec 2012 21:04:19 +0000 (22:04 +0100)
committerMarcel Werk <burntime@woltlab.com>
Tue, 11 Dec 2012 21:04:19 +0000 (22:04 +0100)

Trivial merge