Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 16 Apr 2014 15:07:57 +0000 (17:07 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 16 Apr 2014 15:07:57 +0000 (17:07 +0200)

Trivial merge