Mitchell Hashimoto 9a0f92c5ad Merge branch 'template-timefmt' of github.com:njones/packer into njones-template-timefmt
Conflicts:
	packer/config_template.go
	website/source/docs/templates/configuration-templates.html.markdown
2014-09-05 16:21:30 -07:00
..
2014-09-05 15:49:59 -07:00