Included changes from stable that could not be merged

Marius Cramer

2014-01-28 746e52a6f3cfdd6438f9c62b39c119925a9405f9

1
2
ALTER TABLE `web_domain` ADD `last_quota_notification` DATE NULL DEFAULT NULL;
ALTER TABLE `mail_user` ADD `last_quota_notification` DATE NULL DEFAULT NULL;