]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Tue, 6 May 2014 23:03:31 +0000 (01:03 +0200)
committerFerenc Kovacs <tyrael@php.net>
Tue, 6 May 2014 23:03:31 +0000 (01:03 +0200)
commit64162cd3c2e8314986343707fc59553cbb4502d3
treec4b584e08782ec27d0712f868fcadeff9bf8934c
parent0cd679fb174e32f85a3e7d92e95110abe3bb8632
parentf63ca453e0b8b31fb2dd029327d5435e9650aa4d
Merge branch 'PHP-5.6'

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

Conflicts:
ext/session/tests/031.phpt