Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Mon, 31 Dec 2012 18:51:28 +0000 (19:51 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 31 Dec 2012 18:51:28 +0000 (19:51 +0100)

Trivial merge