Merge branch 'PHP-5.4' into PHP-5.5

author Julien Pauli <jpauli@php.net>

Mon, 17 Feb 2014 09:36:13 +0000 (10:36 +0100)

committer Julien Pauli <jpauli@php.net>

Mon, 17 Feb 2014 09:36:13 +0000 (10:36 +0100)
author Julien Pauli <jpauli@php.net>
Mon, 17 Feb 2014 09:36:13 +0000 (10:36 +0100)
committer Julien Pauli <jpauli@php.net>
Mon, 17 Feb 2014 09:36:13 +0000 (10:36 +0100)
diff --cc ext/json/json.c
Simple merge
diff --cc ext/json/php_json.h
Simple merge
author	Julien Pauli <jpauli@php.net>
	Mon, 17 Feb 2014 09:36:13 +0000 (10:36 +0100)
committer	Julien Pauli <jpauli@php.net>
	Mon, 17 Feb 2014 09:36:13 +0000 (10:36 +0100)
		1	2
ext/json/json.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/json/php_json.h	patch \|	diff1 \|	diff2 \|	blob \| history