From: Ken Barber <ken@bob.sh>
Date: Tue, 7 Feb 2012 13:44:58 +0000 (+0000)
Subject: Merge branch '2.2.x'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=d6fdfaba11aeff35604f1d5a917823f145a1cb76;p=puppet-stdlib.git

Merge branch '2.2.x'

* 2.2.x:
  (#12377) Avoid infinite loop when retrying require json
---

d6fdfaba11aeff35604f1d5a917823f145a1cb76