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

Trivial merge