From: Eric Haszlakiewicz <erh+git@nimenees.com>
Date: Mon, 23 May 2016 02:12:51 +0000 (+0000)
Subject: Merge branch 'doctaweeks-fixes-for-upstream'
X-Git-Tag: json-c-0.13-20171207~164
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4ca1325ae3641fe7507ce72fd075ae68d2ce09b;p=thirdparty%2Fjson-c.git

Merge branch 'doctaweeks-fixes-for-upstream'
---

f4ca1325ae3641fe7507ce72fd075ae68d2ce09b