Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Sat, 1 Jun 2013 17:39:36 +0000 (19:39 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 1 Jun 2013 17:39:36 +0000 (19:39 +0200)

Trivial merge