Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Sun, 29 Dec 2013 07:23:50 +0000 (08:23 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 29 Dec 2013 07:23:50 +0000 (08:23 +0100)

Trivial merge