]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorAnatol Belski <ab@php.net>
Thu, 10 Mar 2016 10:39:16 +0000 (11:39 +0100)
committerAnatol Belski <ab@php.net>
Thu, 10 Mar 2016 10:39:16 +0000 (11:39 +0100)
* PHP-5.6:
  fix error condition, part of bug #71753

1  2 
ext/standard/flock_compat.c

Simple merge