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

Trivial merge