Michael DeHaan b8fdcff524 Merge branch 'nocows' of git://github.com/jpmens/ansible into devel ... Conflicts: lib/ansible/callbacks.py lib/ansible/constants.py		2013-04-27 11:34:39 -04:00
..
ansible	Merge branch 'nocows' of git://github.com/jpmens/ansible into devel	2013-04-27 11:34:39 -04:00