Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 1 Jul 2014 17:55:33 +0000 (19:55 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 1 Jul 2014 17:55:33 +0000 (19:55 +0200)

Trivial merge