]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorJulien Pauli <jpauli@php.net>
Fri, 20 Feb 2015 14:40:46 +0000 (15:40 +0100)
committerJulien Pauli <jpauli@php.net>
Fri, 20 Feb 2015 14:40:46 +0000 (15:40 +0100)
commit72af5cda276a661c73b36d31f60ac4d6ddd85b93
tree61a78c76ff926c138d3483e40a687978ce22060e
parentb97a9a80980e6ba15998a1286469f088fcc392f0
parent13c3b78f1e9f6cf5009631e9a1678c9a4bc443d8
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix #68557

Conflicts:
ext/spl/spl_directory.c
ext/spl/spl_directory.c