Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Thu, 13 Jun 2013 09:14:35 +0000 (11:14 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Thu, 13 Jun 2013 09:14:35 +0000 (11:14 +0200)

Trivial merge