From: Petri Lehtinen <petri@digip.org>
Date: Sun, 11 Mar 2012 19:16:41 +0000 (+0200)
Subject: Merge branch '2.3'
X-Git-Tag: v2.4-moonshot~1^2~35
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=jansson.git;a=commitdiff_plain;h=56039ed596f11e2bc474bb4429a14b277a453e3e

Merge branch '2.3'
---

56039ed596f11e2bc474bb4429a14b277a453e3e