Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Tue, 6 Aug 2013 08:35:38 +0000 (10:35 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 6 Aug 2013 08:35:38 +0000 (10:35 +0200)

Trivial merge