From: Eric Haszlakiewicz <erh+git@nimenees.com>
Date: Sun, 29 Apr 2012 16:15:56 +0000 (-0500)
Subject: Merge branch 'master' into json-c-0.10
X-Git-Tag: json-c-0.10-20120530~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f22de2c11287994f01e1b38aebee0b28f4e23b83;p=thirdparty%2Fjson-c.git

Merge branch 'master' into json-c-0.10
---

f22de2c11287994f01e1b38aebee0b28f4e23b83