Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Mon, 3 Jun 2013 15:00:32 +0000 (17:00 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 3 Jun 2013 15:00:32 +0000 (17:00 +0200)

Trivial merge