Merge branch 'PHP-5.5' into PHP-5.6

author Julien Pauli <jpauli@php.net>

Mon, 16 Mar 2015 15:01:12 +0000 (16:01 +0100)

committer Julien Pauli <jpauli@php.net>

Mon, 16 Mar 2015 15:01:12 +0000 (16:01 +0100)
author Julien Pauli <jpauli@php.net>
Mon, 16 Mar 2015 15:01:12 +0000 (16:01 +0100)
committer Julien Pauli <jpauli@php.net>
Mon, 16 Mar 2015 15:01:12 +0000 (16:01 +0100)
diff --cc ext/session/php_session.h
Simple merge
diff --cc ext/session/session.c
Simple merge
author	Julien Pauli <jpauli@php.net>
	Mon, 16 Mar 2015 15:01:12 +0000 (16:01 +0100)
committer	Julien Pauli <jpauli@php.net>
	Mon, 16 Mar 2015 15:01:12 +0000 (16:01 +0100)
		1	2
ext/session/php_session.h	patch \|	diff1 \|	diff2 \|	blob \| history
ext/session/session.c	patch \|	diff1 \|	diff2 \|	blob \| history