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

Trivial merge