James Cammarata 47b9cc6311 Merge branch 'meta-roles' of https://github.com/eggsby/ansible into eggsby-meta-roles ... Conflicts: lib/ansible/playbook/play.py		2013-09-20 16:17:40 -05:00
..
ansible	Merge branch 'meta-roles' of https://github.com/eggsby/ansible into eggsby-meta-roles	2013-09-20 16:17:40 -05:00