Merge branch 'lja-mods' of https://github.com/MiesSuomesta/json-c into

lja-mods

# Conflicts:
#	json_object.c

.gitignore

@@ -110,3 +110,116 @@
 /include
 /libjson-c.a
 /libjson-c.so
+/Makefile.in
+/aclocal.m4
+/bits.h
+/compile
+/config.guess
+/config.h.in
+/config.sub
+/configure
+/depcomp
+/doc/html/README_8md.html
+/doc/html/annotated.html
+/doc/html/arraylist_8h.html
+/doc/html/bc_s.png
+/doc/html/bdwn.png
+/doc/html/bits_8h.html
+/doc/html/classes.html
+/doc/html/closed.png
+/doc/html/debug_8h.html
+/doc/html/deprecated.html
+/doc/html/doc.png
+/doc/html/doxygen.css
+/doc/html/doxygen.png
+/doc/html/dynsections.js
+/doc/html/files.html
+/doc/html/folderclosed.png
+/doc/html/folderopen.png
+/doc/html/ftv2blank.png
+/doc/html/ftv2doc.png
+/doc/html/ftv2folderclosed.png
+/doc/html/ftv2folderopen.png
+/doc/html/ftv2lastnode.png
+/doc/html/ftv2link.png
+/doc/html/ftv2mlastnode.png
+/doc/html/ftv2mnode.png
+/doc/html/ftv2node.png
+/doc/html/ftv2plastnode.png
+/doc/html/ftv2pnode.png
+/doc/html/ftv2splitbar.png
+/doc/html/ftv2vertline.png
+/doc/html/functions.html
+/doc/html/functions_vars.html
+/doc/html/globals.html
+/doc/html/globals_a.html
+/doc/html/globals_defs.html
+/doc/html/globals_e.html
+/doc/html/globals_enum.html
+/doc/html/globals_eval.html
+/doc/html/globals_f.html
+/doc/html/globals_func.html
+/doc/html/globals_h.html
+/doc/html/globals_i.html
+/doc/html/globals_j.html
+/doc/html/globals_l.html
+/doc/html/globals_m.html
+/doc/html/globals_n.html
+/doc/html/globals_p.html
+/doc/html/globals_s.html
+/doc/html/globals_t.html
+/doc/html/globals_type.html
+/doc/html/globals_vars.html
+/doc/html/index.html
+/doc/html/issues__closed__for__0_813_8md.html
+/doc/html/jquery.js
+/doc/html/json_8h.html
+/doc/html/json__c__version_8h.html
+/doc/html/json__inttypes_8h.html
+/doc/html/json__object_8h.html
+/doc/html/json__object__iterator_8h.html
+/doc/html/json__object__private_8h.html
+/doc/html/json__pointer_8h.html
+/doc/html/json__tokener_8h.html
+/doc/html/json__util_8h.html
+/doc/html/json__visit_8h.html
+/doc/html/linkhash_8h.html
+/doc/html/math__compat_8h.html
+/doc/html/md_issues_closed_for_0_813.html
+/doc/html/menu.js
+/doc/html/menudata.js
+/doc/html/nav_f.png
+/doc/html/nav_g.png
+/doc/html/nav_h.png
+/doc/html/open.png
+/doc/html/pages.html
+/doc/html/printbuf_8h.html
+/doc/html/random__seed_8h.html
+/doc/html/snprintf__compat_8h.html
+/doc/html/splitbar.png
+/doc/html/strdup__compat_8h.html
+/doc/html/strerror__override_8h.html
+/doc/html/strerror__override__private_8h.html
+/doc/html/structarray__list.html
+/doc/html/structjson__object.html
+/doc/html/structjson__object__iter.html
+/doc/html/structjson__object__iterator.html
+/doc/html/structjson__tokener.html
+/doc/html/structjson__tokener__srec.html
+/doc/html/structlh__entry.html
+/doc/html/structlh__table.html
+/doc/html/structprintbuf.html
+/doc/html/sync_off.png
+/doc/html/sync_on.png
+/doc/html/tab_a.png
+/doc/html/tab_b.png
+/doc/html/tab_h.png
+/doc/html/tab_s.png
+/doc/html/tabs.css
+/doc/html/unionjson__object_1_1data.html
+/doc/html/vasprintf__compat_8h.html
+/install-sh
+/ltmain.sh
+/missing
+/test-driver
+/tests/Makefile.in