Mitchell Hashimoto 8f2f654446 Merge branch 'chef_solo_environment_support' of https://github.com/marcparadise/vagrant into marcparadise-chef_solo_environment_support ... Conflicts: plugins/provisioners/chef/config/chef_solo.rb		2013-08-28 16:49:19 -07:00
..
solo.erb	Merge branch 'chef_solo_environment_support' of https://github.com/marcparadise/vagrant into marcparadise-chef_solo_environment_support	2013-08-28 16:49:19 -07:00