Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Tue, 7 May 2013 16:34:48 +0000 (18:34 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 7 May 2013 16:34:48 +0000 (18:34 +0200)

Trivial merge