]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorStanislav Malyshev <stas@php.net>
Fri, 28 Jun 2013 21:02:12 +0000 (14:02 -0700)
committerStanislav Malyshev <stas@php.net>
Fri, 28 Jun 2013 21:02:12 +0000 (14:02 -0700)
* PHP-5.5:
  add fix for  #60560 into upgrading


Trivial merge