From: Eric Haszlakiewicz <erh+git@nimenees.com>
Date: Sat, 30 Apr 2016 18:53:16 +0000 (+0000)
Subject: Merge branch 'Protovision-master'
X-Git-Tag: json-c-0.13-20171207~167
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9edf2418e06619ed0055ae12c2929a126e685603;p=thirdparty%2Fjson-c.git

Merge branch 'Protovision-master'
---

9edf2418e06619ed0055ae12c2929a126e685603