Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Mon, 14 Jan 2013 11:19:25 +0000 (12:19 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 14 Jan 2013 11:19:25 +0000 (12:19 +0100)

Trivial merge