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
..
en.yml	Merge branch 'rsync_install' of https://github.com/tmatilai/vagrant into tmatilai-rsync_install	2014-02-03 12:12:49 +01:00