2 commits

Author	SHA1	Message	Date
James Cammarata	2bad888f28	Merge branch 'v2_final' into devel_switch_v2 ... Conflicts: lib/ansible/inventory/__init__.py lib/ansible/modules/core lib/ansible/utils/__init__.py lib/ansible/utils/module_docs.py	2015-05-28 15:26:03 -05:00
James Cammarata	ce3ef7f4c1	Making the switch to v2	2015-05-03 21:47:26 -05:00