Removing extra chef_handler directory
Merge branch 'master' of ssh://sops01.staging.dmz/srv/git-repos/chef-repo
Import xml version 1.0.0
Fix mistake
Merge branch 'master' of ssh://sops01.staging.dmz/srv/git-repos/chef-repo
Delete the OS X .DS_Store files, setup chefignore to ignore them and add a global gitignore to never commit them
Removing the gitignore that doesn't actually work
Merge branch 'master' of ssh://sops01.staging.dmz/srv/git-repos/chef-repo
Merge branch 'master' of ssh://sops01.staging.dmz/srv/git-repos/chef-repo
Merge branch 'master' of ssh://sops01.staging.dmz/srv/git-repos/chef-repo
Merge branch 'master' of ssh://sops01.staging.dmz/srv/git-repos/chef-repo
Merge branch 'chef-vendor-apache2'
Merge branch 'chef-vendor-java'

Conflicts:
	cookbooks/java/attributes/default.rb
Merge branch 'chef-vendor-memcached'
Merge branch 'chef-vendor-apt'
Merge branch 'chef-vendor-couchdb'
Merge branch 'chef-vendor-nginx'
Merge branch 'master' of file:///srv/git-repos/chef-repo
Merge branch 'chef-vendor-nagios'
Merge branch 'master' of ssh://sops01.staging.dmz/srv/git-repos/chef-repo