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

Merge branch '2.3'

Closes #70.
---

1581f26a7fd2158b8b0149bbd95e9fb42d68a902