From: Petri Lehtinen <petri@digip.org>
Date: Mon, 8 Aug 2011 18:00:47 +0000 (+0300)
Subject: Merge branch '2.1'
X-Git-Tag: v2.2~2
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=jansson.git;a=commitdiff_plain;h=910fb9226738c9f10964283c9aeadc240f0349f4

Merge branch '2.1'
---

910fb9226738c9f10964283c9aeadc240f0349f4