]> granicus.if.org Git - php/commitdiff
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)
* PHP-5.4:
  use limit_extensions as we use security_limit_extensions later (free)
  unused variable


Trivial merge