Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Fri, 26 Jul 2013 06:50:08 +0000 (08:50 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 26 Jul 2013 06:50:08 +0000 (08:50 +0200)

Trivial merge