• Eduardo L. Buratti's avatar
    Merge remote-tracking branch 'origin/next' · 7924fd90
    Eduardo L. Buratti authored
    
    Signed-off-by: Eduardo L. Buratti's avatarEduardo L. Buratti <elb09@c3sl.ufpr.br>
    
    Conflicts:
    	buildpackage/bootstraps/bootstrap-install
    	collect/scripts/collect/mirrors-timestamp/timestamp.string
    	database/create.sh
    	database/create/comment_table.sql
    	database/create/create_bd.sh
    	database/create/create_control.sql
    	database/create/create_dm.sql
    	database/create/create_dw.sql
    	database/create/create_sa.sql
    	database/create/create_user.sql
    	database/create/grants_user.sql
    	database/create/insert_datas_1.sql
    	database/create/insert_datas_2.sql
    	database/cron.sh
    	database/load/f_load_dm.sql
    	database/load/f_load_dw.sql
    	database/load/get_month.sql
    	database/load/load.sql
    	database/load/load_mectb08.sql
    	database/load/load_mectb09.sql
    	database/load/load_mectb10.sql
    	database/load/load_mectb11.sql
    	database/load/load_mectb12.sql
    7924fd90