From: Petri Lehtinen <petri@digip.org>
Date: Sat, 12 Jun 2010 19:44:21 +0000 (+0300)
Subject: Merge branch '1.2'
X-Git-Tag: v1.3~2
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=jansson.git;a=commitdiff_plain;h=8b2b12e05fdcb14c19bf2fc31223838b417354cd

Merge branch '1.2'
---

8b2b12e05fdcb14c19bf2fc31223838b417354cd