update.cf: remove unused variable
Remove meminfo and vmstat from inventory, they are actually monitoring entries
don't create cf_null in masterfiles, as it will interfere with any VCS working directory there. cf_null is kept for 3.4 compatibility, but should be removed with 3.7 or later
Add lsattr to known paths for linux
Merge pull request #154 from nickanderson/feature/paths-lsattr

Add lsattr to known paths for RHEL and Debian
Fix typo in promises.cf
Merge pull request #153 from estenberg/cleanup/cf_null

cf_null cleanup
Add bundle to probablistically call another bundle
Merge pull request #156 from nickanderson/feature/probablistic_usebundle

Add bundle to probablistically call another bundle
lib/3.6/bundles.cf: add cmerge bundle to show data container merging
lib/3.6/bundles.cf: use policy = "free"
Fix probabilistic_usebundle example so it renders correctly
Merge pull request #157 from nickanderson/cleanup/probablistic_usebuundle

Fix probabilistic_usebundle example so it renders correctly
inventory/any.cf: remove uptime inventory
Enable maid service by default so we dont fill disks
Merge pull request #158 from nickanderson/reorg/update

Enable maid service by default so we dont fill disks
files.cf: add edit_xml convenience bundles
Add outputs/dc-scripts.log as a CFEngine log file for cleanup
Merge pull request #159 from nickanderson/redmine/4387

Add outputs/dc-scripts.log as a CFEngine log file for cleanup
Remove _dc_ temporary prefix from DC bundles