From: Andrew Parker <andy@puppetlabs.com>
Date: Wed, 29 Jan 2014 17:28:48 +0000 (-0800)
Subject: Merge branch 'DavidS-broaden-pick-arguments2'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=5b85e7c39f34b3004881517f886d7f06f8f2a440;p=puppet-stdlib.git

Merge branch 'DavidS-broaden-pick-arguments2'

* DavidS-broaden-pick-arguments2:
  (PUP-638) Add a pick_default() function that always returns a value.
  (PUP-636) Ignore generated file
---

5b85e7c39f34b3004881517f886d7f06f8f2a440