]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Fri, 28 Feb 2014 07:12:16 +0000 (08:12 +0100)
committerRemi Collet <remi@php.net>
Fri, 28 Feb 2014 07:12:16 +0000 (08:12 +0100)
* PHP-5.4:
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2


Trivial merge