Mitchell Hashimoto 55931d507e Merge branch 'nfs-sync-folder-cleanup' of https://github.com/emyl/vagrant into emyl-nfs-sync-folder-cleanup ... Conflicts: plugins/providers/virtualbox/action.rb		2013-12-06 15:06:34 -08:00
..
virtualbox	Merge branch 'nfs-sync-folder-cleanup' of https://github.com/emyl/vagrant into emyl-nfs-sync-folder-cleanup	2013-12-06 15:06:34 -08:00