From: Anatol Belski Date: Thu, 10 Mar 2016 08:35:55 +0000 (+0100) Subject: Merge branch 'PHP-5.6' into PHP-7.0 X-Git-Tag: php-7.0.5RC1~10^2~7^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d4c6cf14ee855039f6dafcdcd14c32124963461;p=php Merge branch 'PHP-5.6' into PHP-7.0 * PHP-5.6: tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752) --- 4d4c6cf14ee855039f6dafcdcd14c32124963461