Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Fri, 8 May 2015 16:10:26 +0000 (18:10 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 8 May 2015 16:10:26 +0000 (18:10 +0200)

Trivial merge