From: Remi Collet Date: Fri, 28 Feb 2014 07:12:26 +0000 (+0100) Subject: Merge branch 'PHP-5.5' into PHP-5.6 X-Git-Tag: php-5.6.0beta1~3^2~165 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=06feb15a160eccc7ca880c1828c09462b16603ba;p=php Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: man page: long option name is --strip, not --stripped --global have be removed in 5.2 --- 06feb15a160eccc7ca880c1828c09462b16603ba