Merge branch '1.1'

Conflicts:
	configure.ac
	doc/conf.py

CHANGES

@@ -1,3 +1,12 @@
+Version 1.1.2, released 2009-11-08
+
+* Fix a bug where an error message was not produced if the input file
+  could not be opened in json_load_file()
+* Fix an assertion failure in decoder caused by a minus sign without a
+  digit after it
+* Remove an unneeded include for stdint.h in jansson.h
+
+
 Version 1.1.1, released 2009-10-26
 
 * All documentation files were not distributed with v1.1; build

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ([2.59])
-AC_INIT([jansson], [1.1.1+], [petri@digip.org])
+AC_INIT([jansson], [1.1.2+], [petri@digip.org])
 
 AM_INIT_AUTOMAKE([1.10 foreign])
 

doc/conf.py

@@ -52,7 +52,7 @@ copyright = u'2009, Petri Lehtinen'
 # The short X.Y version.
 version = '1.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.1+'
+release = '1.1.2+'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

src/Makefile.am

@@ -13,6 +13,6 @@ libjansson_la_SOURCES = \
 	utf.h \
 	util.h \
 	value.c
-libjansson_la_LDFLAGS = -version-info 1:0:1
+libjansson_la_LDFLAGS = -version-info 1:1:1
 
 AM_CFLAGS = -Wall -Wextra -Werror

src/jansson.h

@@ -9,7 +9,6 @@
 #define JANSSON_H
 
 #include <stdio.h>
-#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {