From: Petri Lehtinen <petri@digip.org>
Date: Thu, 26 Apr 2012 19:09:48 +0000 (+0300)
Subject: Merge branch '2.3'
X-Git-Tag: v2.4-moonshot~1^2~22
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=jansson.git;a=commitdiff_plain;h=f309e30320fbc4b6bfaa5fb8dc57384a5ddcdcdd

Merge branch '2.3'
---

f309e30320fbc4b6bfaa5fb8dc57384a5ddcdcdd