Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 5 Jun 2014 23:11:38 +0000 (01:11 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 5 Jun 2014 23:11:38 +0000 (01:11 +0200)

Trivial merge