Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 13 Jan 2012 17:57:52 +0000 (18:57 +0100)
committerMarcel Werk <burntime@woltlab.com>
Fri, 13 Jan 2012 17:57:52 +0000 (18:57 +0100)

Trivial merge