]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorAndrey Hristov <andrey@php.net>
Wed, 21 Oct 2015 13:52:38 +0000 (15:52 +0200)
committerAndrey Hristov <andrey@php.net>
Wed, 21 Oct 2015 13:52:38 +0000 (15:52 +0200)
commit8f9b2b68ee017535af5634800158edc76c6cdeb3
treeddc6f72be2d033f2a3830e9dfd7528545d75507d
parent2ef327caed5e7cb2683c040904a57d0cc6be1e5d
parent8292260515a904b4d515484145c78f33a06ae1ae
Merge branch 'PHP-5.6' into PHP-7.0
ext/mysqlnd/mysqlnd_net.c