Bryan Cribbs 3abecb0088 Merge sevos pull/15 into master ... Merge branch 'enable_using_private_ips_from_aws' of https://github.com/sevos/vagrant-hostmanager into master. Conflicts: lib/vagrant-hostmanager/config.rb lib/vagrant-hostmanager/hosts_file.rb		2013-11-15 20:15:10 -06:00
..
en.yml	Merge sevos pull/15 into master	2013-11-15 20:15:10 -06:00