From: Adam Harvey Date: Thu, 1 May 2014 18:23:14 +0000 (-0700) Subject: Merge branch 'PHP-5.5' into PHP-5.6 X-Git-Tag: PRE_PHPNG_MERGE~322^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d5712d6ba4f1797993c49996c04be1a8b37e8dec;p=php Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: Use the right path for the suggested PHP invocation in ext_skel. --- d5712d6ba4f1797993c49996c04be1a8b37e8dec