Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 25 Apr 2012 10:27:21 +0000 (12:27 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 25 Apr 2012 10:27:21 +0000 (12:27 +0200)

Trivial merge