Mitchell Hashimoto 45702f9d44 Merge branch 'issue_2333' of https://github.com/elliotsegler/vagrant into elliotsegler-issue_2333
Conflicts:
	plugins/guests/ubuntu/cap/change_host_name.rb
2013-11-23 15:38:49 -08:00
..
2013-08-03 19:55:17 +02:00
2013-05-01 19:02:00 -07:00
2013-10-17 22:45:23 -04:00
2013-11-23 10:18:59 +08:00