vagrant/lib
Mitchell Hashimoto 13b52f6b6e Merge branch 'client-certs' of https://github.com/sthulb/vagrant into sthulb-client-certs
Conflicts:
	config/default.rb
	lib/vagrant/action/builtin/handle_box_url.rb
	plugins/commands/box/command/add.rb
2013-11-25 16:50:11 -08:00
..
vagrant Merge branch 'client-certs' of https://github.com/sthulb/vagrant into sthulb-client-certs 2013-11-25 16:50:11 -08:00
vagrant.rb core: vagrant version requirements in vagrantfile [GH-2322] 2013-11-23 12:23:34 -08:00