Merge branch '3.2.x' into 3.x

author Hunter Haugen <hunter@puppetlabs.com>

Tue, 18 Mar 2014 23:16:00 +0000 (16:16 -0700)

committer Hunter Haugen <hunter@puppetlabs.com>

Tue, 18 Mar 2014 23:16:00 +0000 (16:16 -0700)
author Hunter Haugen <hunter@puppetlabs.com>
Tue, 18 Mar 2014 23:16:00 +0000 (16:16 -0700)
committer Hunter Haugen <hunter@puppetlabs.com>
Tue, 18 Mar 2014 23:16:00 +0000 (16:16 -0700)
diff --cc .gitignore

index 416889c8919bf2bd227b4dcc23244ca521233518,db949df55d990926b70255c430467e79faccebe6..a7ea5fd5470e87d4fdf6230422ce3cfaab2aa2b5
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,7 -1,3 +1,6 @@@
   pkg/
   .DS_Store
- metadata.json
   coverage/
+ +Gemfile.lock
+ +.bundle/
+ +vendor/bundle/
author	Hunter Haugen <hunter@puppetlabs.com>
	Tue, 18 Mar 2014 23:16:00 +0000 (16:16 -0700)
committer	Hunter Haugen <hunter@puppetlabs.com>
	Tue, 18 Mar 2014 23:16:00 +0000 (16:16 -0700)