Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Fri, 28 Jun 2013 15:19:57 +0000 (17:19 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 28 Jun 2013 15:19:57 +0000 (17:19 +0200)

Trivial merge