From: Tjerk Meesters Date: Thu, 31 Jul 2014 04:18:19 +0000 (+0800) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHPNG_MERGE~37 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a41a16c5cd5af985be349d0cad8d0ad37698aae1;p=php Merge branch 'PHP-5.6' * PHP-5.6: Moved streams related functions to xp_ssl.c --- a41a16c5cd5af985be349d0cad8d0ad37698aae1