Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Wed, 10 Jul 2013 15:50:59 +0000 (17:50 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Wed, 10 Jul 2013 15:50:59 +0000 (17:50 +0200)

Trivial merge