From: Petri Lehtinen <petri@digip.org>
Date: Thu, 28 Jan 2010 19:05:19 +0000 (+0200)
Subject: Merge branch '1.2'
X-Git-Tag: v1.3~19
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=jansson.git;a=commitdiff_plain;h=72e39484383c3a628d350b64c6f83db81ee86a0c

Merge branch '1.2'
---

72e39484383c3a628d350b64c6f83db81ee86a0c