Max Lincoln d6e91483a6 Merge branch 'master' of github.com:mitchellh/vagrant into winrmssl ...

Conflicts:
	vagrant.gemspec

2015-02-09 11:10:23 -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 winrmssl

2015-02-09 11:10:23 -05:00