Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Thu, 27 Mar 2014 15:21:30 +0000 (16:21 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Thu, 27 Mar 2014 15:21:30 +0000 (16:21 +0100)

Trivial merge