pristine-tar data for ansible_0.9.orig.tar.gz
pristine-tar data for ansible_0.9+dfsg.orig.tar.gz
pristine-tar data for ansible_1.1+dfsg.orig.tar.gz
pristine-tar data for ansible_1.2.1.orig.tar.gz
pristine-tar data for ansible_1.3.4+dfsg.orig.tar.gz
pristine-tar data for ansible_1.3.4+dfsg.orig.tar.gz
pristine-tar data for ansible_1.4.0+dfsg.orig.tar.gz
pristine-tar data for ansible_1.4.1+dfsg.orig.tar.gz
pristine-tar data for ansible_1.4.3+dfsg.orig.tar.gz
pristine-tar data for ansible_1.4.4+dfsg.orig.tar.gz
pristine-tar data for ansible_1.5.3+dfsg.orig.tar.gz
Merge branch 'pristine-tar' of ssh://git.debian.org/git/collab-maint/ansible into pristine-tar
Imported Upstream version 1.6.0+dfsg
Merge branch 'upstream'

Conflicts:
	CHANGELOG.md
	RELEASES.txt
	VERSION
	debian/changelog
	debian/control
	debian/patches/743027-fix.patch
	debian/patches/ansible-galaxy-manpage.patch
	debian/patches/ansible-vault-manpage.patch
	debian/patches/stock-doctheme
	lib/ansible/__init__.py
	lib/ansible/utils/vault.py
	packaging/debian/changelog
	packaging/rpm/ansible.spec
Remove patches applied upstream.
Fix manpage warning.

Refreshing the manpage from the asciidoc is sufficient to fix, but
I committed the output as it is not regenerated as part of the
build process.
d/changelog: Ready for release.