cfengine/core — pull request #2049 by jimis (2014-12-01 19:39:16+00:00)
Title: Redmine#6331: Skip non-empty directories silently when recursively deleting

(cherry picked from commit 3eb20427fb9c1b303466aad08008a9195afc4f5d)

Conflicts:
cf-agent/verify_files_utils.c