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

Trivial merge