From: Ferenc Kovacs <tyrael@php.net>
Date: Tue, 6 May 2014 22:55:05 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.13RC1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e2d396b52de88f299882b872a3603a4c37644a5;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

8e2d396b52de88f299882b872a3603a4c37644a5