Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 25 Aug 2014 17:44:14 +0000 (19:44 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 25 Aug 2014 17:44:14 +0000 (19:44 +0200)

Trivial merge