From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 13 Dec 2012 09:40:42 +0000 (+0400)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha2~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b1b11563396012797f7729cd6fe8172bf3ca08d;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #63757 (getenv() produces memory leak with CGI SAPI)

Conflicts:
	NEWS
---

4b1b11563396012797f7729cd6fe8172bf3ca08d