Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Sat, 23 May 2015 05:41:42 +0000 (07:41 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 23 May 2015 05:41:42 +0000 (07:41 +0200)

Trivial merge