Michael DeHaan 65178290e7 Merge branch 'devel' of git://github.com/nextus/ansible into devel ... Conflicts: lib/ansible/constants.py		2013-10-07 08:39:23 -04:00
..
ansible	Merge branch 'devel' of git://github.com/nextus/ansible into devel	2013-10-07 08:39:23 -04:00