Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Fri, 15 Aug 2014 10:50:18 +0000 (12:50 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 15 Aug 2014 10:50:18 +0000 (12:50 +0200)

Trivial merge