Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 28 Mar 2012 23:07:20 +0000 (01:07 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 28 Mar 2012 23:07:20 +0000 (01:07 +0200)

Trivial merge