From: Petri Lehtinen <petri@digip.org>
Date: Tue, 20 Mar 2012 18:56:00 +0000 (+0200)
Subject: Merge branch '2.3'
X-Git-Tag: v2.4-moonshot~1^2~33
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=jansson.git;a=commitdiff_plain;h=d286e7b753d26ca26479629952c53e2a89fb8fba

Merge branch '2.3'
---

d286e7b753d26ca26479629952c53e2a89fb8fba