Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Sun, 23 Mar 2014 21:41:47 +0000 (22:41 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 23 Mar 2014 21:41:47 +0000 (22:41 +0100)

Trivial merge