trrr
Merge branch 'master' of https://github.com/derbeneviv/puppet_hints

Conflicts:
	openstack/errors.txt
deddd