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

Merge branch '2.1.x' into 2.2.x

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

46401caef6e00708867d09319985528c39636ba2