Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Fri, 27 Sep 2013 17:16:54 +0000 (19:16 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 27 Sep 2013 17:16:54 +0000 (19:16 +0200)

Trivial merge