diff options
author | Sara Golemon <pollita@php.net> | 2013-02-21 03:21:49 -0800 |
---|---|---|
committer | Sara Golemon <pollita@php.net> | 2013-02-21 03:21:49 -0800 |
commit | c16d6befd429a2e55c266b6e8df7fe2f93f68c91 (patch) | |
tree | c0b6cc0b373cb4410deb75277b98699d8c0ffef5 /ext/mysqlnd/mysqlnd_alloc.c | |
parent | 9a44a9806c7c7a8c1fc691210335d0691a4597be (diff) | |
parent | bc55a8eb9f1cf5e77b96a4eb2a1920ba0037e128 (diff) | |
download | php-git-c16d6befd429a2e55c266b6e8df7fe2f93f68c91.tar.gz |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
http-stream test requires network connectivity
Diffstat (limited to 'ext/mysqlnd/mysqlnd_alloc.c')
0 files changed, 0 insertions, 0 deletions