Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Sun, 5 Jan 2014 21:20:07 +0000 (22:20 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 5 Jan 2014 21:20:07 +0000 (22:20 +0100)

Trivial merge