Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Mon, 23 Dec 2013 13:46:35 +0000 (14:46 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 23 Dec 2013 13:46:35 +0000 (14:46 +0100)

Trivial merge