From: Eric Haszlakiewicz <erh+git@nimenees.com>
Date: Tue, 9 Aug 2016 11:36:54 +0000 (-0400)
Subject: Merge branch 'issue-165' of https://github.com/jobol/json-c into jobol-issue-165
X-Git-Tag: json-c-0.13-20171207~136^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3db59d9905b66ec3752c60461678835109f43ff;p=thirdparty%2Fjson-c.git

Merge branch 'issue-165' of https://github.com/jobol/json-c into jobol-issue-165

Conflicts:
	tests/test_util_file.c
---

f3db59d9905b66ec3752c60461678835109f43ff