From: Hunter Haugen <hunter@puppetlabs.com>
Date: Tue, 18 Mar 2014 23:16:00 +0000 (-0700)
Subject: Merge branch '3.2.x' into 3.x
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=904f1a003e790ba2afaf3452ecda9805e87d80d0;p=puppet-stdlib.git

Merge branch '3.2.x' into 3.x
---

904f1a003e790ba2afaf3452ecda9805e87d80d0
diff --cc .gitignore
index 416889c,db949df..a7ea5fd
--- a/.gitignore
+++ b/.gitignore
@@@ -1,7 -1,3 +1,6 @@@
  pkg/
  .DS_Store
- metadata.json
  coverage/
 +Gemfile.lock
 +.bundle/
 +vendor/bundle/