From: Eric Haszlakiewicz <erh+git@nimenees.com>
Date: Thu, 16 Feb 2012 01:38:07 +0000 (-0600)
Subject: Merge branch 'master' of https://github.com/json-c/json-c
X-Git-Tag: json-c-0.10-20120530~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15db9372f33c4a62a7a3b5f5ca1986e37ccb4bb9;p=thirdparty%2Fjson-c.git

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

15db9372f33c4a62a7a3b5f5ca1986e37ccb4bb9