From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 28 Nov 2013 13:03:28 +0000 (+0400)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~353^2~171^2~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7fa9032d0bc1d95bbe91bf87f46705ac577ae2c2;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Some rare deprecated cases replaced by ZEND_ASSERT() (some extensions might need to be fixed)
  Removed duplicated hash function implementation (100% source compatible)
---

7fa9032d0bc1d95bbe91bf87f46705ac577ae2c2