Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 17 Apr 2012 20:43:33 +0000 (22:43 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 17 Apr 2012 20:43:33 +0000 (22:43 +0200)

Trivial merge