Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 12 Jun 2013 14:40:08 +0000 (16:40 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 12 Jun 2013 14:40:08 +0000 (16:40 +0200)

Trivial merge