Merge branch 'PHP-5.5'

* PHP-5.5:
  add fix for  #60560 into upgrading
This commit is contained in:
Stanislav Malyshev 2013-06-28 14:02:12 -07:00
commit 66667dda47

Diff Content Not Available