Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 26 Jun 2012 13:43:53 +0000 (15:43 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 26 Jun 2012 13:43:53 +0000 (15:43 +0200)

Trivial merge