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


Trivial merge