Merge branch 'feature/git-attributes' into 'stable-3.1'

Marius Burkard

2016-03-02 1325b11714cddb3be557aee5c3ec03f29cee69f4

1
ALTER TABLE `ftp_user` ADD `expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `dl_bandwidth` ;