From: Michael Wallner <mike@php.net>
Date: Fri, 9 Aug 2013 09:39:41 +0000 (+0200)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~327
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5acdcbc0bc49767cd76b1ba4c1cf34814ccffdc9;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  fix bug #65391
  Update NEWS
  Update NEWS

Conflicts:
	ext/zlib/tests/bug65391.phpt
---

5acdcbc0bc49767cd76b1ba4c1cf34814ccffdc9