]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorChristoph M. Becker <cmb@php.net>
Wed, 27 Jul 2016 16:59:40 +0000 (18:59 +0200)
committerChristoph M. Becker <cmb@php.net>
Wed, 27 Jul 2016 17:00:38 +0000 (19:00 +0200)
commit40afd77826e19023df3f095525956f713bf0d96f
tree6385f9695ff11db25fe6073d918f0e3224a99855
parent5513f00a972d1781349035cc097971fb9056cce1
parent315c0536c20619478fc548b782132cd65286018f
Merge branch 'PHP-5.6' into PHP-7.0

# Resolved conflicts:
# ext/pcre/php_pcre.c
NEWS
ext/pcre/php_pcre.c