Merge branch '1.1'

Conflicts:
	configure.ac
	doc/conf.py

diff --combined configure.ac
index 3a35945,1a6f7e7..8de9c05
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1,5 -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])
++AC_INIT([jansson], [1.1.2+], [petri@digip.org])
  
  AM_INIT_AUTOMAKE([1.10 foreign])
  

diff --combined doc/conf.py
index 02b4c79,be257e1..c13315a
--- 1/doc/conf.py
--- 2/doc/conf.py
+++ b/doc/conf.py
@@@ -52,7 -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'
++release = '1.1.2+'
  
  # The language for content autogenerated by Sphinx. Refer to documentation
  # for a list of supported languages.
@@@ -69,7 -69,7 +69,7 @@@
  
  # List of directories, relative to source directory, that shouldn't be searched
  # for source files.
 -exclude_trees = ['.build']
 +exclude_trees = ['_build']
  
  # The reST default role (used for this markup: `text`) to use for all documents.
  #default_role = None

diff --combined src/jansson.h
index a3a97e0,ac6736f..c8a5a90
--- 1/src/jansson.h
--- 2/src/jansson.h
+++ b/src/jansson.h
@@@ -9,7 -9,6 +9,6 @@@
  #define JANSSON_H
  
  #include <stdio.h>
- #include <stdint.h>
  
  #ifdef __cplusplus
  extern "C" {
@@@ -143,7 -142,6 +142,7 @@@ json_t *json_loadf(FILE *input, json_er
  json_t *json_load_file(const char *path, json_error_t *error);
  
  #define JSON_INDENT(n)   (n & 0xFF)
 +#define JSON_COMPACT     0x100
  
  char *json_dumps(const json_t *json, unsigned long flags);
  int json_dumpf(const json_t *json, FILE *output, unsigned long flags);