summaryrefslogtreecommitdiff
path: root/Zend
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2015-05-28 10:37:39 +0200
committerRemi Collet <remi@php.net>2015-05-28 10:37:39 +0200
commit7611d1c41b926ab023eba0eb481541056cc979fc (patch)
tree987c2072ad043df4b617d2f600cfd5c1cb92b464 /Zend
parent482c69bf635d49b06c59cc37518daec78be1ea58 (diff)
parent09b92a3a542455651016afe1bc9854e52b4673c3 (diff)
downloadphp-git-7611d1c41b926ab023eba0eb481541056cc979fc.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Relax a little this test, because random is not reliable
Diffstat (limited to 'Zend')
0 files changed, 0 insertions, 0 deletions