From: Jeff McCune <jeff@puppetlabs.com>
Date: Fri, 11 May 2012 05:25:14 +0000 (-0700)
Subject: Merge branch '2.3.x'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=e8e2a16ce506955026395b4ddb4451484bd29835;p=puppet-stdlib.git

Merge branch '2.3.x'

* 2.3.x:
  Update CHANGELOG for 2.3.2 release
  Make file_line default to ensure => present
  Memoize file_line spec instance variables
  Fix spec tests using the new spec_helper
---

e8e2a16ce506955026395b4ddb4451484bd29835