From: Petri Lehtinen <petri@digip.org>
Date: Tue, 23 Mar 2010 06:15:19 +0000 (+0200)
Subject: Merge branch '1.2'
X-Git-Tag: v1.3~7
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=jansson.git;a=commitdiff_plain;h=49880cbabeb597a9c748a3d5f37e9961a084dce3

Merge branch '1.2'
---

49880cbabeb597a9c748a3d5f37e9961a084dce3