Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 12 Jun 2013 13:44:46 +0000 (15:44 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 12 Jun 2013 13:44:46 +0000 (15:44 +0200)

Trivial merge