puppetlabs/puppetdb — pull request #414 by cprice-puppet (2013-01-22 23:40:14+00:00)
Title: Maint/master/puppetdb docs there can be only one

This series of commits syncs the docs in our repo with those in the `puppet-docs` repo in preparation for our 1.1 release.