Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Sun, 26 May 2013 13:49:20 +0000 (15:49 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 26 May 2013 13:49:20 +0000 (15:49 +0200)

Trivial merge