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

Merge branch '1.2'

Conflicts:
	LICENSE
---

8d75235ff22dc4aced697e198c3c024f1f4b88fe