Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Tue, 8 Jul 2014 06:46:29 +0000 (08:46 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 8 Jul 2014 06:46:29 +0000 (08:46 +0200)

Trivial merge