From: Christopher Jones <sixd@php.net>
Date: Wed, 21 Aug 2013 22:07:13 +0000 (-0700)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~268^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=71ba571e535ab8a1442c9a96db8099a5d3623b3b;p=php

Merge branch 'PHP-5.5'

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

71ba571e535ab8a1442c9a96db8099a5d3623b3b