Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 20 Jun 2014 14:10:41 +0000 (16:10 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 20 Jun 2014 14:10:41 +0000 (16:10 +0200)

Trivial merge