Merge branch '2.3'

diff --combined doc/conf.py
index 15023d0,fbbf65b..35c5238
--- 1/doc/conf.py
--- 2/doc/conf.py
+++ b/doc/conf.py
@@@ -41,16 -41,16 +41,16 @@@ master_doc = 'index
  
  # General information about the project.
  project = u'Jansson'
- copyright = u'2009-2011, Petri Lehtinen'
+ copyright = u'2009-2012, Petri Lehtinen'
  
  # The version info for the project you're documenting, acts as replacement for
  # |version| and |release|, also used in various other places throughout the
  # built documents.
  #
  # The short X.Y version.
 -version = '2.3'
 +version = '2.4'
  # The full version, including alpha/beta/rc tags.
 -release = version
 +release = '2.4-dev'
  
  # The language for content autogenerated by Sphinx. Refer to documentation
  # for a list of supported languages.

diff --combined src/jansson.h
index 2346a28,68a367c..17885d4
--- 1/src/jansson.h
--- 2/src/jansson.h
+++ b/src/jansson.h
@@@ -1,5 -1,5 +1,5 @@@
  /*
-  * Copyright (c) 2009-2011 Petri Lehtinen <petri@digip.org>
+  * Copyright (c) 2009-2012 Petri Lehtinen <petri@digip.org>
   *
   * Jansson is free software; you can redistribute it and/or modify
   * it under the terms of the MIT license. See LICENSE for details.
@@@ -22,10 -22,10 +22,10 @@@ extern "C" 
  
  #define JANSSON_MAJOR_VERSION  2
  #define JANSSON_MINOR_VERSION  3
 -#define JANSSON_MICRO_VERSION  0
 +#define JANSSON_MICRO_VERSION  99
  
  /* Micro version is omitted if it's 0 */
 -#define JANSSON_VERSION  "2.3"
 +#define JANSSON_VERSION  "2.4-dev"
  
  /* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this
     for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */