Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 13 Jan 2012 14:54:05 +0000 (15:54 +0100)
committerMarcel Werk <burntime@woltlab.com>
Fri, 13 Jan 2012 14:54:05 +0000 (15:54 +0100)

Trivial merge