mirror of https://github.com/ansible/ansible.git
Merge branch 'user_password_update_optional' of git://github.com/bcoca/ansible into devel
Conflicts: library/system/userpull/3220/merge
commit
17cf833e0e
Conflicts: library/system/userpull/3220/merge