Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 11 Nov 2011 21:23:40 +0000 (22:23 +0100)
committerMarcel Werk <burntime@woltlab.com>
Fri, 11 Nov 2011 21:23:40 +0000 (22:23 +0100)

Trivial merge