Merge branch '1.1'

Conflicts:
	Makefile.am

diff --cc Makefile.am
index 185eaab,2a69f16..a141cd5
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -1,4 -1,10 +1,7 @@@
  EXTRA_DIST = CHANGES LICENSE README.rst
  SUBDIRS = doc src test
  
 -
 -distcheck-hook:
 -      sphinx-build -b html -W \
 -              $(distdir)/doc \
 -              $(distdir)/_build/doc/.build/html
 +check-local: html
++
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = jansson.pc

diff --cc configure.ac
Simple merge