From: Petri Lehtinen <petri@digip.org>
Date: Mon, 21 Dec 2009 12:13:05 +0000 (+0200)
Subject: Merge branch '1.1'
X-Git-Tag: v1.2~16
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=jansson.git;a=commitdiff_plain;h=6637b976edd508cc9413ce954fe4275eab8c2c69

Merge branch '1.1'
---

6637b976edd508cc9413ce954fe4275eab8c2c69