Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Wed, 11 Mar 2015 17:11:15 +0000 (18:11 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Wed, 11 Mar 2015 17:11:15 +0000 (18:11 +0100)

Trivial merge