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

Merge branch 'RyDroid-tests'
---

e40505e489b3e6a04984b89f2aead91265e40803