From: Eric Haszlakiewicz <erh+git@nimenees.com>
Date: Mon, 1 Apr 2013 01:58:54 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/json-c/json-c
X-Git-Tag: json-c-0.11-20130402~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7ca1e523f05ae00367931f0d27e9515cf7f28a6b;p=json-c

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

7ca1e523f05ae00367931f0d27e9515cf7f28a6b