docker.py
11.8 KB
-
Merge branch 'retf_py' of git://github.com/berendt/ansible into devel · 8c4161d4
Conflicts: lib/ansible/inventory/vars_plugins/group_vars.py plugins/callbacks/mail.py
Michael DeHaan committed
Conflicts: lib/ansible/inventory/vars_plugins/group_vars.py plugins/callbacks/mail.py