From: Ken Barber <ken@bob.sh>
Date: Wed, 11 Jan 2012 14:53:13 +0000 (+0000)
Subject: Merge branch '2.2.x'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=c4b836e322deab90f4cf27e8efe4f1a1c91cf235;p=puppet-stdlib.git

Merge branch '2.2.x'

* 2.2.x:
  (#11873) time function spec failure on Fixnum matcher
---

c4b836e322deab90f4cf27e8efe4f1a1c91cf235