Merge branch 'dns_delete_check' into 'master'

Marius Cramer

2014-07-30 d57ffdc6c176209b63ba461de4564d13ec388fed

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