Mitchell Hashimoto 75395af12d Merge branch '1064-fix-upload-file-permissions' of github.com:rasa/packer into rasa-1064-fix-upload-file-permissions
Conflicts:
	builder/parallels/common/step_upload_parallels_tools.go
	builder/vmware/common/step_upload_tools.go
	provisioner/chef-client/provisioner.go
	provisioner/chef-solo/provisioner.go
2014-09-08 13:20:46 -07:00
..
2013-11-02 22:56:54 -05:00
2014-07-29 16:15:53 -07:00
2013-10-17 22:50:02 +00:00
fmt
2014-09-02 09:55:06 -07:00