From: Petri Lehtinen <petri@digip.org>
Date: Thu, 21 Apr 2011 10:15:58 +0000 (+0300)
Subject: Merge branch '2.0'
X-Git-Tag: v2.1~11
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=jansson.git;a=commitdiff_plain;h=c3492973e16d5c34e56b49c8d7e868ee29290606

Merge branch '2.0'
---

c3492973e16d5c34e56b49c8d7e868ee29290606