Merge branch '2.0'

diff --git a/doc/conf.py b/doc/conf.py
index c8911ab..493c0d5 100644 (file)
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -50,7 +50,7 @@ copyright = u'2009-2011, Petri Lehtinen'
 # The short X.Y version.
 version = '2.0'
 # The full version, including alpha/beta/rc tags.
-release = '2.0'
+release = '2.0+git'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/src/jansson.h b/src/jansson.h
index 0ab0dfd..9ea314e 100644 (file)
--- a/src/jansson.h
+++ b/src/jansson.h
@@ -22,7 +22,7 @@ extern "C" {
 
 #define JANSSON_MAJOR_VERSION  2
 #define JANSSON_MINOR_VERSION  0
-#define JANSSON_MICRO_VERSION  0
+#define JANSSON_MICRO_VERSION  255
 
 /* Micro version is omitted if it's 0 */
 #define JANSSON_VERSION  "2.0"