]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge branch '2.4.x'
authorJeff McCune <jeff@puppetlabs.com>
Tue, 14 Aug 2012 17:09:26 +0000 (10:09 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Tue, 14 Aug 2012 17:09:26 +0000 (10:09 -0700)
* 2.4.x:
  Add support for a 'match' parameter to file_line


Trivial merge