]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Mon, 13 Apr 2015 12:40:43 +0000 (14:40 +0200)
committerRemi Collet <remi@php.net>
Mon, 13 Apr 2015 12:40:43 +0000 (14:40 +0200)
* PHP-5.5:
  fix type in fix for #69085

1  2 
ext/soap/soap.c

diff --cc ext/soap/soap.c
Simple merge