Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 10 Apr 2012 19:45:26 +0000 (21:45 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 10 Apr 2012 19:45:26 +0000 (21:45 +0200)

Trivial merge