From: Petri Lehtinen <petri@digip.org>
Date: Fri, 7 May 2010 04:36:01 +0000 (+0300)
Subject: Merge branch '1.2'
X-Git-Tag: v1.3~4
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=jansson.git;a=commitdiff_plain;h=782acfe378b8d6dddb307029ba97688943312340

Merge branch '1.2'
---

782acfe378b8d6dddb307029ba97688943312340