Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 5 Sep 2012 11:26:22 +0000 (13:26 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 5 Sep 2012 11:26:22 +0000 (13:26 +0200)

Trivial merge