]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Fri, 28 Jun 2013 21:01:53 +0000 (14:01 -0700)
committerStanislav Malyshev <stas@php.net>
Fri, 28 Jun 2013 21:01:53 +0000 (14:01 -0700)
commit657d48601363de9fb599d5967136cd970e36575b
treeb1091f9742f1e1241150546326223643c384969f
parent4020ef8980cb2236566aec9d59c8e0f62fb6098a
parent103cf4c060b7eed97b67549bee4836794a595e38
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add fix for  #60560 into upgrading