Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 11 Jun 2014 22:39:09 +0000 (00:39 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 11 Jun 2014 22:39:09 +0000 (00:39 +0200)

Trivial merge