puppetlabs/puppetlabs-puppetdb — pull request #8 by cprice-puppet (2012-09-21 00:10:29+00:00)
Title: Fix duplicate stanza in database_ini.pp

There was a minor problem with a merge conflict in the previous
commit. This commit should fix it.