Mitchell Hashimoto f63ef395f1 Merge branch 'rsync_install' of https://github.com/tmatilai/vagrant into tmatilai-rsync_install ... Conflicts: plugins/guests/freebsd/plugin.rb plugins/guests/netbsd/plugin.rb plugins/guests/openbsd/plugin.rb		2014-02-03 12:12:49 +01:00
..
vagrant	Merge branch 'rsync_install' of https://github.com/tmatilai/vagrant into tmatilai-rsync_install	2014-02-03 12:12:49 +01:00
vagrant.rb	core: log plugins and their versions	2014-01-08 20:04:57 -08:00