Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 13 Mar 2012 14:06:34 +0000 (15:06 +0100)
committerMarcel Werk <burntime@woltlab.com>
Tue, 13 Mar 2012 14:06:34 +0000 (15:06 +0100)

Trivial merge