Merge branch 'PHP-5.4' into PHP-5.5

author Dmitry Stogov <dmitry@zend.com>

Tue, 3 Mar 2015 07:45:07 +0000 (10:45 +0300)

committer Dmitry Stogov <dmitry@zend.com>

Tue, 3 Mar 2015 07:45:07 +0000 (10:45 +0300)
author Dmitry Stogov <dmitry@zend.com>
Tue, 3 Mar 2015 07:45:07 +0000 (10:45 +0300)
committer Dmitry Stogov <dmitry@zend.com>
Tue, 3 Mar 2015 07:45:07 +0000 (10:45 +0300)
diff --cc ext/soap/php_encoding.c
Simple merge
diff --cc ext/soap/soap.c
Simple merge
author	Dmitry Stogov <dmitry@zend.com>
	Tue, 3 Mar 2015 07:45:07 +0000 (10:45 +0300)
committer	Dmitry Stogov <dmitry@zend.com>
	Tue, 3 Mar 2015 07:45:07 +0000 (10:45 +0300)
		1	2
ext/soap/php_encoding.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/soap/soap.c	patch \|	diff1 \|	diff2 \|	blob \| history