From: Petri Lehtinen <petri@digip.org>
Date: Thu, 2 Feb 2012 15:03:03 +0000 (+0200)
Subject: Merge branch '2.3'
X-Git-Tag: v2.4-moonshot~1^2~38
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=jansson.git;a=commitdiff_plain;h=98a99fb2bd650d8b28be1ae3e2687f3e81c4c03c

Merge branch '2.3'
---

98a99fb2bd650d8b28be1ae3e2687f3e81c4c03c