Mitchell Hashimoto 862331fbf0 Merge branch '1.4.3' ... Conflicts: CHANGELOG.md lib/vagrant/version.rb		2014-01-02 10:16:52 -08:00
..
vagrant	Merge branch '1.4.3'	2014-01-02 10:16:52 -08:00
vagrant.rb	style	2013-12-28 13:49:43 -07:00