From: Sam hartman <hartmans@painless-security.com>
Date: Wed, 17 Apr 2013 11:26:04 +0000 (+0100)
Subject: Merge commit 'v2.4' into HEAD
X-Git-Tag: v2.4-moonshot~1
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=jansson.git;a=commitdiff_plain;h=292ff8f6da2fb3ad3686029946a6d77fdb11aa6f

Merge commit 'v2.4' into HEAD

Conflicts:
	Makefile.am
---

292ff8f6da2fb3ad3686029946a6d77fdb11aa6f
diff --cc Makefile.am
index 7e962db,a40aa46..5b4fb98
--- a/Makefile.am
+++ b/Makefile.am
@@@ -1,4 -1,4 +1,5 @@@
- EXTRA_DIST = CHANGES LICENSE README.rst jansson.spec
 -EXTRA_DIST = CHANGES LICENSE README.rst win32
++EXTRA_DIST = CHANGES LICENSE README.rst win32 jansson.spec
++
  SUBDIRS = doc src test
  
  # "make distcheck" builds the dvi target, so use it to check that the