]> granicus.if.org Git - php/commit
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)
commitf63ca453e0b8b31fb2dd029327d5435e9650aa4d
tree948d525540cf91e3fc116a415909b1fc64b8e2fa
parentd2f283884f068d8f5b0269782876a28c0a41c9bb
parent8e2d396b52de88f299882b872a3603a4c37644a5
Merge branch 'PHP-5.5' into PHP-5.6

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