Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Wed, 27 Mar 2013 17:16:04 +0000 (18:16 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Wed, 27 Mar 2013 17:16:04 +0000 (18:16 +0100)

Trivial merge