]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Thu, 2 May 2013 08:15:49 +0000 (10:15 +0200)
committerRemi Collet <remi@php.net>
Thu, 2 May 2013 08:15:49 +0000 (10:15 +0200)
commit2f12769db06fa395c6efc22aa9fa01f82f4b3168
treef27a06a94daa3e921bdf6de28ac5e3ccf59e2dbe
parentd42ae3273807ba0ea7ae73f126aceed41c5e4a55
parent78c48af2f2702eb88727a65f1756273b95a88138
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  use limit_extensions as we use security_limit_extensions later (free)
  unused variable