]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Wed, 11 Dec 2013 12:33:16 +0000 (13:33 +0100)
committerAnatol Belski <ab@php.net>
Wed, 11 Dec 2013 12:33:16 +0000 (13:33 +0100)
* PHP-5.4:
  fix dir separator in cve-2013-6420 test


Trivial merge