Brian Johnson e217beeabe Merge branch 'master' into new-hosts-os-hosts-file ... Conflicts: lib/vagrant-hostmanager/config.rb lib/vagrant-hostmanager/hosts_file.rb locales/en.yml		2013-06-13 13:52:09 -07:00
..
en.yml	Merge branch 'master' into new-hosts-os-hosts-file	2013-06-13 13:52:09 -07:00