mirror of https://github.com/ansible/ansible.git
Merge branch 'hash-behavior-plugins' of git://github.com/echohead/ansible into devel
Conflicts: lib/ansible/inventory/__init__.pypull/5772/merge
commit
f2d9e064ec
Conflicts: lib/ansible/inventory/__init__.pypull/5772/merge