Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Fri, 28 Jun 2013 14:36:09 +0000 (16:36 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 28 Jun 2013 14:36:09 +0000 (16:36 +0200)

Trivial merge