Mitchell Hashimoto 65ef8d2477 Merge branch 'nfs-per-user' of https://github.com/davedevelopment/vagrant into davedevelopment-nfs-per-user ... Conflicts: plugins/hosts/arch/host.rb plugins/hosts/bsd/host.rb plugins/hosts/linux/host.rb templates/nfs/exports.erb templates/nfs/exports_freebsd.erb templates/nfs/exports_linux.erb		2013-09-01 11:44:00 -07:00
..
host.rb	Merge branch 'nfs-per-user' of https://github.com/davedevelopment/vagrant into davedevelopment-nfs-per-user	2013-09-01 11:44:00 -07:00
plugin.rb	Hosts to V2	2012-11-06 21:20:22 -08:00