]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0cd679f f63ca45)
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)
* PHP-5.6:
  Fixed test (it requires ext/hash)

Conflicts:
ext/session/tests/031.phpt


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.