puppetlabs/puppetlabs-puppetdb — pull request #7 by cprice-puppet (2012-09-20 23:23:40+00:00)
Title: Maint/master/resolve merge conflict

Merge in ghoneycutt's commit for compliance with style guide