Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 19 Sep 2014 18:07:42 +0000 (20:07 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 19 Sep 2014 18:07:42 +0000 (20:07 +0200)

Trivial merge