From: Stanislav Malyshev <stas@php.net>
Date: Mon, 19 Aug 2013 17:53:08 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.6RC1~20^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ea9729cd0e30f2bb22844b648a1b4f36645dcf6;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
---

4ea9729cd0e30f2bb22844b648a1b4f36645dcf6