Commit f2d9e064 by Michael DeHaan

Merge branch 'hash-behavior-plugins' of git://github.com/echohead/ansible into devel

Conflicts:
	lib/ansible/inventory/__init__.py
parents ba79cf34 13432bb1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment