Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Sun, 19 May 2013 12:51:21 +0000 (14:51 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 19 May 2013 12:51:21 +0000 (14:51 +0200)

Trivial merge