]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Sun, 5 Jan 2014 18:21:27 +0000 (19:21 +0100)
committerAnatol Belski <ab@php.net>
Sun, 5 Jan 2014 18:21:27 +0000 (19:21 +0100)
* PHP-5.4:
  one more extension for the basename test


Trivial merge