]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorFerenc Kovacs <tyrael@php.net>
Tue, 6 May 2014 22:55:05 +0000 (00:55 +0200)
committerFerenc Kovacs <tyrael@php.net>
Tue, 6 May 2014 22:55:05 +0000 (00:55 +0200)
* PHP-5.4:
  Fixed test (it requires ext/hash)


Trivial merge