From: Petri Lehtinen <petri@digip.org>
Date: Sun, 20 Dec 2009 19:18:27 +0000 (+0200)
Subject: Merge branch '1.1'
X-Git-Tag: v1.2~18
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=jansson.git;a=commitdiff_plain;h=e7a5dc58e630aa079f402b46a65d218e656dd489

Merge branch '1.1'

Conflicts:
	configure.ac
	doc/conf.py
---

e7a5dc58e630aa079f402b46a65d218e656dd489
diff --cc configure.ac
index 4020469,5df7d77..d28a5e4
--- a/configure.ac
+++ b/configure.ac
@@@ -1,5 -1,5 +1,5 @@@
  AC_PREREQ([2.59])
- AC_INIT([jansson], [1.1.2+], [petri@digip.org])
 -AC_INIT([jansson], [1.1.3], [petri@digip.org])
++AC_INIT([jansson], [1.1.3+], [petri@digip.org])
  
  AM_INIT_AUTOMAKE([1.10 foreign])
  
diff --cc doc/conf.py
index c13315a,377e75d..10f444d
--- a/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.2+'
 -release = '1.1.3'
++release = '1.1.3+'
  
  # The language for content autogenerated by Sphinx. Refer to documentation
  # for a list of supported languages.