]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7c1679 80f7b01)
Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Fri, 29 Jan 2016 18:59:26 +0000 (19:59 +0100)
committerAnatol Belski <ab@php.net>
Fri, 29 Jan 2016 18:59:26 +0000 (19:59 +0100)
* PHP-7.0:
  refix #69111 and one related test

Conflicts:
ext/session/tests/rfc1867_sid_invalid.phpt


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