Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Sun, 4 Aug 2013 12:47:41 +0000 (14:47 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 4 Aug 2013 12:47:41 +0000 (14:47 +0200)

Trivial merge