Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 6 Jun 2014 21:07:16 +0000 (23:07 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 6 Jun 2014 21:07:16 +0000 (23:07 +0200)

Trivial merge