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

Trivial merge