]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Sat, 21 Feb 2015 13:16:06 +0000 (14:16 +0100)
committerAnatol Belski <ab@php.net>
Sat, 21 Feb 2015 13:16:06 +0000 (14:16 +0100)
commit7aec946ddb8b295c7db149774d1e6d28981198bc
tree2ff43162f3c5a386713f3c6467005da729b98133
parentea94be490a5e620a86883963fa5dfa421a2477dc
parent3cf2b7cc2b26b45699fc998dc57fee103bbf09a2
Merge branch 'PHP-5.6'

* PHP-5.6:
  revisit fix for bug #65272

Conflicts:
ext/standard/file.c
ext/standard/file.c
ext/standard/flock_compat.c