Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add fix for  #60560 into upgrading
This commit is contained in:
Stanislav Malyshev 2013-06-28 14:01:53 -07:00
commit 657d486013

Diff content is not available