From: Andrea Faulds <ajf@ajf.me>
Date: Wed, 12 Feb 2014 09:52:25 +0000 (+0000)
Subject: Merge branch 'master' into LowercaseLiterals
X-Git-Tag: json-c-0.12-20140410~14^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F121%2Fhead;p=thirdparty%2Fjson-c.git

Merge branch 'master' into LowercaseLiterals
---

cf23e7506eeb2f3e6268751f11dade6c8800c891