From: Eric Haszlakiewicz Date: Sun, 23 Dec 2012 16:59:52 +0000 (-0600) Subject: Merge branch 'master' of https://github.com/json-c/json-c X-Git-Tag: json-c-0.11-20130402~24 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=29436911814d006eb7d713ad72e5c0d936f441f3;p=thirdparty%2Fjson-c.git Merge branch 'master' of https://github.com/json-c/json-c --- 29436911814d006eb7d713ad72e5c0d936f441f3