]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7cf8df5 c07150c)
Merge branch 'PHP-5.6'
authorJulien Pauli <jpauli@php.net>
Wed, 2 Sep 2015 15:51:02 +0000 (17:51 +0200)
committerJulien Pauli <jpauli@php.net>
Wed, 2 Sep 2015 15:51:02 +0000 (17:51 +0200)
* PHP-5.6:
  5.5.30 next
  More fixes for bug #70219

Conflicts:
ext/pcre/php_pcre.c
ext/session/session.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.