From: Eric Haszlakiewicz <erh+git@nimenees.com>
Date: Sat, 13 Aug 2016 13:17:01 +0000 (-0400)
Subject: Merge branch 'tests' of https://github.com/RyDroid/json-c into RyDroid-tests
X-Git-Tag: json-c-0.13-20171207~131^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=61cd433131fc8d1e7b6e8325dcff9524260a0a49;p=thirdparty%2Fjson-c.git

Merge branch 'tests' of https://github.com/RyDroid/json-c into RyDroid-tests

Conflicts:
	tests/test_util_file.c
---

61cd433131fc8d1e7b6e8325dcff9524260a0a49