Merge branch 'master' of github.com:WoltLab/WCF into travis
authorMatthias Schmidt <gravatronics@live.com>
Sat, 5 Jan 2013 12:18:49 +0000 (13:18 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 5 Jan 2013 12:18:49 +0000 (13:18 +0100)

Trivial merge