]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Fri, 28 Feb 2014 07:12:38 +0000 (08:12 +0100)
committerRemi Collet <remi@php.net>
Fri, 28 Feb 2014 07:12:38 +0000 (08:12 +0100)
commit0821d3942ea1d5315d176d94c727e9fbdb420881
tree40a81b488d2961c703e1e60224311d60dd3d59e4
parent79063d16b99b68f95f7fc7b9dc08860fb8d1b614
parent06feb15a160eccc7ca880c1828c09462b16603ba
Merge branch 'PHP-5.6'

* PHP-5.6:
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2