Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Tue, 5 Mar 2013 13:58:36 +0000 (14:58 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 5 Mar 2013 13:58:36 +0000 (14:58 +0100)

Trivial merge