]> granicus.if.org Git - php/commit
Merge branch 'master' into master-rfc-session-lock4
authorYasuo Ohgaki <yohgaki@php.net>
Thu, 29 Jan 2015 00:55:36 +0000 (09:55 +0900)
committerYasuo Ohgaki <yohgaki@php.net>
Thu, 29 Jan 2015 00:55:36 +0000 (09:55 +0900)
commitf90f6108c83da86c8f9df8c610ad570d33c1cf09
tree864c80cd9957dd666f754499067532cb25f5369f
parente71099bc4ef382d08eb10466710e4e44f503f11c
parent14d68d364138689a9ecab12e1af0bc0bf1081c41
Merge branch 'master' into master-rfc-session-lock4

Conflicts:
UPGRADING
UPGRADING
UPGRADING.INTERNALS
ext/session/session.c