From: Anatol Belski <ab@php.net>
Date: Thu, 20 Feb 2014 17:54:35 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.11RC1~67
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d4d4155d26f8725365ee24797ecd14cba049a53;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed leak introduced after CVE/upgrade
---

6d4d4155d26f8725365ee24797ecd14cba049a53