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

Trivial merge