From: Jeff McCune <jeff@puppetlabs.com>
Date: Wed, 7 Nov 2012 17:44:35 +0000 (-0800)
Subject: Merge branch '3.x' into 4.x
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=0b3e8f59a915fe4536a571234c1eea031b4ad6bb;p=puppet-stdlib.git

Merge branch '3.x' into 4.x

* 3.x:
  Add function, uriescape, to URI.escape strings. Redmine #17459
  Add function, uriescape, to URI.escape strings. Redmine #17459
  Update CHANGELOG, Modulefile for 3.1.1
---

0b3e8f59a915fe4536a571234c1eea031b4ad6bb