ansible/ansible — pull request #3173 by tima (2013-06-10 23:38:58+00:00)
Title: Introduced ansible-rsync to core.

This replace #2979 and fixes the borked history. I created patches and started over to avoid any more confusion.

I'm positive I did not use "git merge" however I may have forgotten --rebase when I did my git pull. Oh well. Hope this works this time.