Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 23 Jun 2015 11:42:00 +0000 (13:42 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 23 Jun 2015 11:42:00 +0000 (13:42 +0200)

Trivial merge