From: Eric Haszlakiewicz <erh+git@nimenees.com>
Date: Wed, 12 Feb 2014 04:06:19 +0000 (-0500)
Subject: Merge branch 'ebassi-master'
X-Git-Tag: json-c-0.12-20140410~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b821f0e10f20b35769d13ab9bac96c5973914854;p=thirdparty%2Fjson-c.git

Merge branch 'ebassi-master'
---

b821f0e10f20b35769d13ab9bac96c5973914854