socorro
Merge branch 'master' of https://github.com/sebastianhutter/ansible

Conflicts:
	.gitignore