Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Fri, 2 Aug 2013 13:17:22 +0000 (15:17 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 2 Aug 2013 13:17:22 +0000 (15:17 +0200)

Trivial merge