Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 13 May 2015 15:23:01 +0000 (17:23 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 13 May 2015 15:23:01 +0000 (17:23 +0200)

Trivial merge