Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 3 Jul 2014 12:17:54 +0000 (14:17 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 3 Jul 2014 12:17:54 +0000 (14:17 +0200)

Trivial merge