Michael DeHaan 1366c663eb Merge branch 'copy-diff-take2' of git://github.com/stoned/ansible into better_diff ... Conflicts: library/file		2013-02-26 20:51:32 -05:00
..
ansible	Merge branch 'copy-diff-take2' of git://github.com/stoned/ansible into better_diff	2013-02-26 20:51:32 -05:00