]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorYasuo Ohgaki <yohgaki@php.net>
Wed, 22 Jan 2014 10:23:52 +0000 (19:23 +0900)
committerYasuo Ohgaki <yohgaki@php.net>
Wed, 22 Jan 2014 10:23:52 +0000 (19:23 +0900)
commit36a7f48e845a600ea8f98d186cd397237e81f15d
treeb4bd0abdbe1e848ceca5fabe9cada36307e29e4e
parent9cefeea8605aad222e89ededd06b5617fa2013bd
parent3cc6c6c587081178d4c68e9ee1bc021532598ff3
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed previous commit may delete unwanted cookies. Sync tests from upper branches.
  Re-fixed bug #66469