From: Ferenc Kovacs <tyrael@php.net>
Date: Tue, 6 May 2014 23:03:31 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~301
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=64162cd3c2e8314986343707fc59553cbb4502d3;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed test (it requires ext/hash)

Conflicts:
	ext/session/tests/031.phpt
---

64162cd3c2e8314986343707fc59553cbb4502d3