Michael DeHaan c00699d0ef Merge branch 'integration' ...

Conflicts:
	lib/ansible/playbook.py
	lib/ansible/runner.py
	library/apt

2012-04-23 21:05:06 -04:00

..

ansible

Merge branch 'integration'

2012-04-23 21:05:06 -04:00