Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Thu, 9 May 2013 14:05:15 +0000 (16:05 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Thu, 9 May 2013 14:05:15 +0000 (16:05 +0200)

Trivial merge