Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 3 Oct 2014 20:28:57 +0000 (22:28 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 3 Oct 2014 20:28:57 +0000 (22:28 +0200)

Trivial merge