Michael DeHaan 8c4161d4a1 Merge branch 'retf_py' of git://github.com/berendt/ansible into devel ...

Conflicts:
	lib/ansible/inventory/vars_plugins/group_vars.py
	plugins/callbacks/mail.py

2014-08-08 12:17:37 -04:00

..

context_demo.py

…

hipchat.py

…

log_plays.py

…

mail.py

Merge branch 'retf_py' of git://github.com/berendt/ansible into devel

2014-08-08 12:17:37 -04:00

osx_say.py

…