Merge branch '1.2'

Conflicts:
	configure.ac

diff --cc .gitignore
Simple merge

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

diff --cc src/hashtable.c
Simple merge

diff --cc src/jansson.h.in
index 24b4949,539400a..4980d01
--- 1/src/jansson.h
--- 2/src/jansson.h.in
+++ b/src/jansson.h.in
@@@ -87,9 -91,8 +92,9 @@@ void *json_object_iter_at(json_t *objec
  void *json_object_iter_next(json_t *object, void *iter);
  const char *json_object_iter_key(void *iter);
  json_t *json_object_iter_value(void *iter);
 +int json_object_iter_set_new(json_t *object, void *iter, json_t *value);
  
- static inline
+ static JSON_INLINE
  int json_object_set(json_t *object, const char *key, json_t *value)
  {
      return json_object_set_new(object, key, json_incref(value));

diff --cc src/value.c
Simple merge