Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Sun, 16 Jun 2013 15:45:23 +0000 (17:45 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 16 Jun 2013 15:45:23 +0000 (17:45 +0200)

Trivial merge