]> granicus.if.org Git - php/commit
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)
commit8e2d396b52de88f299882b872a3603a4c37644a5
tree7c796ae34efbdec141579517140ea3426f7b40db
parent579898e3382ae975ab1cc03738676e4e6582bf89
parent8517001b259f1e8e540ee45cf15cf0312ca14098
Merge branch 'PHP-5.4' into PHP-5.5

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