Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Tue, 22 Jul 2014 11:09:42 +0000 (13:09 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 22 Jul 2014 11:09:42 +0000 (13:09 +0200)

Trivial merge