Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Sat, 9 May 2015 07:28:31 +0000 (09:28 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 9 May 2015 07:28:31 +0000 (09:28 +0200)

Trivial merge