Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 16 May 2012 17:21:13 +0000 (19:21 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 16 May 2012 17:21:13 +0000 (19:21 +0200)

Trivial merge