Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 21 Feb 2012 19:57:13 +0000 (20:57 +0100)
committerMarcel Werk <burntime@woltlab.com>
Tue, 21 Feb 2012 19:57:13 +0000 (20:57 +0100)

Trivial merge