Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
  Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
This commit is contained in:
Stanislav Malyshev 2013-08-19 11:19:43 -07:00
commit d17ade127b

Diff Content Not Available