Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 5 Jun 2013 15:20:33 +0000 (17:20 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 5 Jun 2013 15:20:33 +0000 (17:20 +0200)

Trivial merge