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

Trivial merge