summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/mysqlnd_alloc.c
diff options
context:
space:
mode:
authorSara Golemon <pollita@php.net>2013-02-21 03:21:49 -0800
committerSara Golemon <pollita@php.net>2013-02-21 03:21:49 -0800
commitc16d6befd429a2e55c266b6e8df7fe2f93f68c91 (patch)
treec0b6cc0b373cb4410deb75277b98699d8c0ffef5 /ext/mysqlnd/mysqlnd_alloc.c
parent9a44a9806c7c7a8c1fc691210335d0691a4597be (diff)
parentbc55a8eb9f1cf5e77b96a4eb2a1920ba0037e128 (diff)
downloadphp-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