From: Stanislav Malyshev <stas@php.net>
Date: Fri, 28 Jun 2013 21:01:53 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2RC1~17^2~21^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=657d48601363de9fb599d5967136cd970e36575b;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

657d48601363de9fb599d5967136cd970e36575b