Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 7 May 2014 15:45:19 +0000 (17:45 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 7 May 2014 15:45:19 +0000 (17:45 +0200)

Trivial merge