Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Sat, 24 May 2014 10:56:05 +0000 (12:56 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 24 May 2014 10:56:05 +0000 (12:56 +0200)

Trivial merge