Merge branch '2.0'

Conflicts:
	doc/conf.py
	src/jansson.h

src/Makefile.am

@@ -17,7 +17,7 @@ libjansson_la_SOURCES = \
 	value.c
 libjansson_la_LDFLAGS = \
 	-export-symbols-regex '^json_' \
-	-version-info 4:0:0
+	-version-info 4:1:0
 
 if GCC
 # These flags are gcc specific

src/jansson.h

@@ -25,7 +25,7 @@ extern "C" {
 #define JANSSON_MICRO_VERSION  255
 
 /* Micro version is omitted if it's 0 */
-#define JANSSON_VERSION  "2.0"
+#define JANSSON_VERSION  "2.0.1+git"
 
 /* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this
    for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */