Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 12 Mar 2012 22:32:39 +0000 (23:32 +0100)
committerMarcel Werk <burntime@woltlab.com>
Mon, 12 Mar 2012 22:32:39 +0000 (23:32 +0100)

Trivial merge