Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 25 Nov 2011 19:03:38 +0000 (20:03 +0100)
committerMarcel Werk <burntime@woltlab.com>
Fri, 25 Nov 2011 19:03:38 +0000 (20:03 +0100)

Trivial merge