Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Thu, 16 Apr 2015 16:04:13 +0000 (18:04 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Thu, 16 Apr 2015 16:04:13 +0000 (18:04 +0200)

Trivial merge