]> granicus.if.org Git - php/commit
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)
commit5fc7382a57550c8997cf00c0839916c78766bfe5
tree5dc5489b0f7628354738a7fa5839d6fb5f621262
parent561843c9731f976f15867a09b906132999c73039
parentb1df743b7a9da1b84d5af8dfb430a98022009cd8
Merge branch 'PHP-5.4' into PHP-5.5

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