Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Wed, 10 Jul 2013 16:42:15 +0000 (18:42 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Wed, 10 Jul 2013 16:42:15 +0000 (18:42 +0200)

Trivial merge