Michael DeHaan 393bfd59b7 Merge branch 'file_hard' of git://github.com/bcoca/ansible into devel ... Conflicts: library/files/file		2013-06-18 20:31:05 -04:00
..
assemble
copy
fetch
file	Merge branch 'file_hard' of git://github.com/bcoca/ansible into devel	2013-06-18 20:31:05 -04:00
ini_file
lineinfile
template