Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Sat, 28 Jun 2014 14:52:11 +0000 (16:52 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 28 Jun 2014 14:52:11 +0000 (16:52 +0200)

Trivial merge