Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 10 Feb 2012 18:51:13 +0000 (19:51 +0100)
committerMarcel Werk <burntime@woltlab.com>
Fri, 10 Feb 2012 18:51:13 +0000 (19:51 +0100)

Trivial merge