From: Christopher Jones <sixd@php.net>
Date: Thu, 22 Aug 2013 16:06:43 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.4RC1~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c1ecdfbf6ec6d3d7962d66ab3cbbfd21b2ac9685;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
  Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type""
---

c1ecdfbf6ec6d3d7962d66ab3cbbfd21b2ac9685