Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 26 Jun 2014 13:42:17 +0000 (15:42 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 26 Jun 2014 13:42:17 +0000 (15:42 +0200)

Trivial merge