]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Thu, 13 Dec 2012 09:40:42 +0000 (13:40 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 13 Dec 2012 09:40:42 +0000 (13:40 +0400)
* PHP-5.4:
  Fixed bug #63757 (getenv() produces memory leak with CGI SAPI)

Conflicts:
NEWS


Trivial merge