Merge branch 'fix-slash' of git://github.com/jrbasso/jansson

author Petri Lehtinen <petri@digip.org>

Fri, 29 Jun 2012 10:17:55 +0000 (13:17 +0300)

committer Petri Lehtinen <petri@digip.org>

Fri, 29 Jun 2012 10:24:55 +0000 (13:24 +0300)
author Petri Lehtinen <petri@digip.org>
Fri, 29 Jun 2012 10:17:55 +0000 (13:17 +0300)
committer Petri Lehtinen <petri@digip.org>
Fri, 29 Jun 2012 10:24:55 +0000 (13:24 +0300)
diff --cc src/dump.c
Simple merge
diff --cc src/jansson.h
Simple merge
author	Petri Lehtinen <petri@digip.org>
	Fri, 29 Jun 2012 10:17:55 +0000 (13:17 +0300)
committer	Petri Lehtinen <petri@digip.org>
	Fri, 29 Jun 2012 10:24:55 +0000 (13:24 +0300)
		1	2
src/dump.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/jansson.h	patch \|	diff1 \|	diff2 \|	blob \| history