Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Wed, 5 Jun 2013 14:13:41 +0000 (16:13 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Wed, 5 Jun 2013 14:13:41 +0000 (16:13 +0200)

Trivial merge