Max Lincoln c37c12526a Merge branch 'master' of github.com:mitchellh/vagrant into winrm_error_handling ... Conflicts: vagrant.gemspec		2015-01-28 10:44:47 -05:00
..
acceptance	providers/virtualbox: don't error when intnet set to "true" [GH-2751]	2014-01-03 08:31:14 -08:00
config	Add `rake acceptance:boxes` to download required boxes for tests	2011-11-13 13:37:30 -08:00
support	core: don't use Tempdir for tests, use Dir.mktmpdir	2014-01-15 10:48:19 -08:00
unit	Merge branch 'master' of github.com:mitchellh/vagrant into winrm_error_handling	2015-01-28 10:44:47 -05:00