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

Trivial merge