Conflicts:
	CHANGELOG.md
	VERSION
	docs/man/man1/ansible-playbook.1
	docs/man/man1/ansible.1
	lib/ansible/__init__.py
	lib/ansible/playbook.py
	lib/ansible/utils.py
	packaging/rpm/ansible.spec