Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Sat, 25 May 2013 16:15:39 +0000 (18:15 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 25 May 2013 16:15:39 +0000 (18:15 +0200)

Trivial merge