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
..
command	Merge branch 'client-certs' of https://github.com/sthulb/vagrant into sthulb-client-certs	2013-11-25 16:50:11 -08:00
plugin.rb	core: Get rid of code that deals with box info on a separate statefile	2013-10-29 13:09:24 -02:00