James Van Dyke 355fdecafa Merge remote-tracking branch 'upstream/master' into provisioner-chef-solo ...

Conflicts:
	config.go

Add the chef-solo provisioner back to config.go.
Fix import path for chef-solo provisioner.

2013-07-10 08:58:00 -04:00

..

main.go

Merge remote-tracking branch 'upstream/master' into provisioner-chef-solo

2013-07-10 08:58:00 -04:00