From: Nikita Popov <nikic@php.net>
Date: Sun, 6 May 2012 11:40:06 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~232^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e1b690e0ce4b29416bd9f514a660d12e993aeab;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Add NEWS entry for bug #61961
  Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
---

9e1b690e0ce4b29416bd9f514a660d12e993aeab