Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 4 Apr 2012 18:49:23 +0000 (20:49 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 4 Apr 2012 18:49:23 +0000 (20:49 +0200)

Trivial merge