James Cammarata 5e240fec71 Merge branch 'devel' of https://github.com/l1k/ansible into l1k-devel ... Conflicts: test/integration/roles/test_copy/tasks/main.yml		2014-08-21 13:56:26 -05:00
..
ansible	Merge branch 'devel' of https://github.com/l1k/ansible into l1k-devel	2014-08-21 13:56:26 -05:00