Mitchell Hashimoto 4bd3f09099 Merge branch 'master' of https://github.com/armon/packer into armon-master
Conflicts:
	packer/config_template.go
2013-09-05 17:12:15 -07:00
..
2013-06-14 12:32:14 -07:00
2013-08-30 22:59:13 -07:00
2013-09-02 10:42:05 -07:00