From: Dmitry Stogov <dmitry@zend.com>
Date: Sun, 28 Jul 2013 09:50:13 +0000 (+0400)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~371
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=294335761b75d13d374312d9074d1f9270f69267;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  Merge from GitHub
  Update NEWS
  Fixed bug #65336

Conflicts:
	NEWS
---

294335761b75d13d374312d9074d1f9270f69267