Merge branch '1.0.x'
authorHunter Haugen <hunter@puppetlabs.com>
Fri, 11 Jul 2014 21:29:15 +0000 (14:29 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Fri, 11 Jul 2014 21:29:15 +0000 (14:29 -0700)
commit7d1c75a649417588bf2d62ddddead06fd6347896
tree13a4a9c236a9c1b52698b62f06af7ca5c80421b9
parent8eb3d7f62157f24a0f0f4caea07b71bf27c01b37
parentaa6d6c3d8f49673bc5731668c018ee18735a9a0f
Merge branch '1.0.x'