.
up
Merge branch 'master' of https://github.com/thornag/tf-scripts

Conflicts:
	lib/defs.tf