Merge branch '1.2'

Conflicts:
	CHANGES
	configure.ac
	doc/conf.py

diff --cc CHANGES
index dcbf6a0,af75a6b..19226de
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -1,12 -1,33 +1,42 @@@
 +Version 1.3 (in development)
 +============================
 +
 +* New encoding flags:
 +
 +  - ``JSON_PRESERVE_ORDER``: Preserve the insertion order of object
 +    keys.
 +
 +
+ Version 1.2.1
+ =============
+ 
+ Released 2010-04-03
+ 
+ * Bug fixes:
+ 
+   - Fix reference counting on ``true``, ``false`` and ``null``
+   - Estimate real number underflows in decoder with 0.0 instead of
+     issuing an error
+ 
+ * Portability:
+ 
+   - Make ``int32_t`` available on all systems
+   - Support compilers that don't have the ``inline`` keyword
+   - Require Autoconf 2.60 (for ``int32_t``)
+ 
+ * Tests:
+ 
+   - Print test names correctly when ``VERBOSE=1``
+   - ``test/suites/api``: Fail when a test fails
+   - Enhance tests for iterators
+   - Enhance tests for decoding texts that contain null bytes
+ 
+ * Documentation:
+ 
+   - Don't remove ``changes.rst`` in ``make clean``
+   - Add a chapter on RFC conformance
+ 
+ 
  Version 1.2
  ===========
  

diff --cc configure.ac
index 9a4bd99,afc4b5a..a42a99c
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1,5 -1,5 +1,5 @@@
  AC_PREREQ([2.60])
- AC_INIT([jansson], [1.2+], [petri@digip.org])
 -AC_INIT([jansson], [1.2.1], [petri@digip.org])
++AC_INIT([jansson], [1.2.1+], [petri@digip.org])
  
  AM_INIT_AUTOMAKE([1.10 foreign])
  

diff --cc doc/conf.py
index 2a95aad,8bf1082..b0625e1
--- 1/doc/conf.py
--- 2/doc/conf.py
+++ b/doc/conf.py
@@@ -52,7 -52,7 +52,7 @@@ copyright = u'2009, 2010 Petri Lehtinen
  # The short X.Y version.
  version = '1.2'
  # The full version, including alpha/beta/rc tags.
- release = '1.2+'
 -release = '1.2.1'
++release = '1.2.1+'
  
  # The language for content autogenerated by Sphinx. Refer to documentation
  # for a list of supported languages.

diff --cc src/Makefile.am
Simple merge