Mitchell Hashimoto 034c151720 Merge branch 'resumable-download' of https://github.com/rconradharris/vagrant into rconradharris-resumable-download ...

Conflicts:
	CHANGELOG.md

2013-11-23 15:42:48 -08:00

..

vagrant

Merge branch 'resumable-download' of https://github.com/rconradharris/vagrant into rconradharris-resumable-download

2013-11-23 15:42:48 -08:00

vagrant.rb

core: vagrant version requirements in vagrantfile [GH-2322]

2013-11-23 12:23:34 -08:00