Fixing merge conflict with master before release
Fixing merge conflict with master before release

chef-cookbooks/database,rtenijenhuis/database,ovaistariq/database,BarthV/database,opscode-cookbooks/database,theprobie/database,rtenijenhuis/database,burnzy/database,chewi/database,ovaistariq/database,chr4-cookbooks/database,yakara-ltd/database,Ecodev/database,ovaistariq/database,philosowaffle/database,chewi/database,RobertNorthard/database,schubergphilis/database,opscode-cookbooks/database,seancoyne/database,miguelaferreira/database,axsuul/cookbook-database,axsuul/cookbook-database,schubergphilis/database,dwashko/chef-database,chewi/database,miguelaferreira/database,dwashko/chef-database,axsuul/cookbook-database,chef-cookbooks/database,h4ck3rm1k3/database,dwashko/chef-database,chr4-cookbooks/database,philosowaffle/database,seancoyne/database,BarthV/database,miguelaferreira/database,RobertNorthard/database,opscode-cookbooks/database,Ecodev/database,schubergphilis/database,rtenijenhuis/database,GannettDigital/chef-database,seancoyne/database,RobertNorthard/database,yakara-ltd/database,burnzy/database,chr4-cookbooks/database,Ecodev/database,GannettDigital/chef-database,theprobie/database,theprobie/database,BarthV/database,yakara-ltd/database,h4ck3rm1k3/database,burnzy/database,philosowaffle/database,h4ck3rm1k3/database