Michael Bearne 8b6d63ab58 Merge remote branch 'remotes/upstream/master' ... Refactored redhat distribution to fit new model Conflicts: lib/vagrant/systems/linux.rb templates/debian_network_entry.erb templates/locales/en.yml templates/network_entry.erb templates/network_entry_debian.erb		2011-01-10 14:21:52 +00:00
..
vagrant	Merge remote branch 'remotes/upstream/master'	2011-01-10 14:21:52 +00:00
vagrant.rb	Load vagrant/version so that `vagrant version` works again	2011-01-07 01:25:54 -08:00