Mitchell Hashimoto 4c9e6e46b2 provisioners/salt: don't use exteranl deep_merge [GH-2348]		2014-03-07 09:18:34 -08:00
..
vagrant	provisioners/salt: don't use exteranl deep_merge [GH-2348]	2014-03-07 09:18:34 -08:00
vagrant.rb	core: load system plugins if they are installed	2014-03-03 09:44:29 -08:00