Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Wed, 26 Jun 2013 12:40:39 +0000 (14:40 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Wed, 26 Jun 2013 12:40:39 +0000 (14:40 +0200)

Trivial merge