Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Thu, 8 Aug 2013 11:01:30 +0000 (13:01 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Thu, 8 Aug 2013 11:01:30 +0000 (13:01 +0200)

Trivial merge