opscode/chef — pull request #602 by jcam (2013-01-22 17:15:33+00:00)
Title: remote_file: CHEF-1031: FTP URLs; CHEF-3786: authenticated HTTP/S

Conflicts:

lib/chef/provider/remote_file.rb
lib/chef/resource/remote_file.rb