Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sun, 21 Jun 2015 22:55:32 +0000 (00:55 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sun, 21 Jun 2015 22:55:32 +0000 (00:55 +0200)

Trivial merge