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

Trivial merge