From: Felipe Pena Date: Wed, 1 Jan 2014 11:57:03 +0000 (-0200) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHPNG_MERGE~353^2~75 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=57a62090515e7c4561b832aad4068aaff437ff5d;p=php Merge branch 'PHP-5.6' * PHP-5.6: - Fixed bug #66381 (__ss_family was changed on AIX 5.3) --- 57a62090515e7c4561b832aad4068aaff437ff5d