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
..
ssh	Use .key? instead of .has_key?	2015-01-05 18:29:01 -05:00
winrm	Merge branch 'master' of github.com:mitchellh/vagrant into winrm_error_handling	2015-01-28 10:44:47 -05:00