Michael DeHaan c2988dfdb0 Merge branch 'option-updates' of git://github.com/jlund/ansible into devel ... Conflicts: bin/ansible-pull		2013-06-30 19:31:37 -04:00
..
ansible	Merge branch 'option-updates' of git://github.com/jlund/ansible into devel	2013-06-30 19:31:37 -04:00