From: Anatol Belski Date: Fri, 11 Jul 2014 13:07:22 +0000 (+0200) Subject: Merge branch 'PHP-5.5' into PHP-5.6 X-Git-Tag: PRE_PHPNG_MERGE~93^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c79a6a0613303dcced860f0400236997b18eaa65;p=php Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: fix makefile in phpize mode --- c79a6a0613303dcced860f0400236997b18eaa65