Merge branch '1.5.x' into merge
authorAshley Penney <ashley.penney@puppetlabs.com>
Thu, 3 Jul 2014 17:08:11 +0000 (13:08 -0400)
committerAshley Penney <ashley.penney@puppetlabs.com>
Thu, 3 Jul 2014 17:08:11 +0000 (13:08 -0400)
commit3c48598eebbd3d62bcec69893b652dc0b71cecb7
tree1330a1c722ec078cc82def7b53bd00cb055e3db9
parent98d16464c32d17e449cc12dd2406654afe81f397
parentc77a2f423962b57483ed5d85b034f22000677838
Merge branch '1.5.x' into merge

Conflicts:
Gemfile
spec/acceptance/apt_key_provider_spec.rb
manifests/init.pp