From: Julien Pauli Date: Mon, 23 Feb 2015 10:23:57 +0000 (+0100) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~80 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09c43bd398fcb87737b6d44b6d79ee22b366eb4c;p=php Merge branch 'PHP-5.6' * PHP-5.6: Updated NEWS updated NEWS curl: add new proxy constants --- 09c43bd398fcb87737b6d44b6d79ee22b366eb4c