From: Christopher Jones <sixd@php.net>
Date: Wed, 21 Aug 2013 22:23:48 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
X-Git-Tag: php-5.5.4RC1~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d2a2e949fea336787c23215aa8d91f3e7a41a432;p=php

Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
---

d2a2e949fea336787c23215aa8d91f3e7a41a432