James Cammarata 8f504dacdd Merge branch 'devel' into v2_final ... Conflicts: lib/ansible/modules/core v2/ansible/modules/core v2/ansible/modules/extras		2015-05-04 16:35:11 -05:00
..
ansible	Merge branch 'devel' into v2_final	2015-05-04 16:35:11 -05:00