From: Nikita Popov Date: Thu, 4 Sep 2014 19:23:11 +0000 (+0200) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHP7_REMOVALS~122^2~2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00805ffb92077bb51d83ad7d0475a501589a7f21;p=php Merge branch 'PHP-5.6' Conflicts: ext/soap/php_http.c --- 00805ffb92077bb51d83ad7d0475a501589a7f21