Mitchell Hashimoto 3bedc77cc4 Merge branch '2293-track-box-url' of https://github.com/fgrehm/vagrant into fgrehm-2293-track-box-url ... Conflicts: plugins/commands/box/command/list.rb		2013-11-25 13:20:26 -08:00
..
vagrant	Merge branch '2293-track-box-url' of https://github.com/fgrehm/vagrant into fgrehm-2293-track-box-url	2013-11-25 13:20:26 -08:00
vagrant.rb	core: vagrant version requirements in vagrantfile [GH-2322]	2013-11-23 12:23:34 -08:00