Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sun, 31 Aug 2014 15:06:34 +0000 (17:06 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sun, 31 Aug 2014 15:06:34 +0000 (17:06 +0200)

Trivial merge