Merge branch 'fix-git-package-debian' into 1.0.x
authorHunter Haugen <hunter@puppetlabs.com>
Mon, 16 Jun 2014 20:54:34 +0000 (13:54 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Mon, 16 Jun 2014 20:54:34 +0000 (13:54 -0700)

Trivial merge