From: Jeff McCune <jeff@puppetlabs.com>
Date: Tue, 14 Aug 2012 17:09:26 +0000 (-0700)
Subject: Merge branch '2.4.x'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=1076aa05456e5303148dd3938787735b47fa391e;p=puppet-stdlib.git

Merge branch '2.4.x'

* 2.4.x:
  Add support for a 'match' parameter to file_line
---

1076aa05456e5303148dd3938787735b47fa391e