puppetlabs/puppetdb — pull request #490 by kbarber (2013-04-08 18:12:40+00:00)
Title: Maint/master/missing cherries from 12x

Here are some missing changes to the 1.2.x that need to be picked into master.