From: Eric Haszlakiewicz <erh+git@nimenees.com>
Date: Sun, 22 Apr 2012 19:26:06 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/json-c/json-c
X-Git-Tag: json-c-0.10-20120530~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7502b377b719d1510c0c9dd1dbcd6bb295edc2f9;p=thirdparty%2Fjson-c.git

Merge branch 'master' of https://github.com/json-c/json-c
---

7502b377b719d1510c0c9dd1dbcd6bb295edc2f9