com php-src: Merge branch 'PHP-5.6': ext/mysqlnd/mysqlnd_net .c
| From: | Andrey Hristov | Date: | Wed, 16 Jul 2014 16:25:31 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/mysqlnd/mysqlnd_net .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79481@lists.php.net to get a copy of this message | ||
Commit: 5d6805d4982999bd302b13dbe6052e10de7f9db2
Author: Andrey Hristov <andrey@php.net> Wed, 16 Jul 2014 19:25:31 +0300
Parents: a0cc25bbfbe923881f1902fabefecad1e257eb31 06f5f65c947891808ef2087dbbe1f6c97daf45ed
Branches: master
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=5d6805d4982999bd302b13dbe6052e10de7f9db2
Log:
Merge branch 'PHP-5.6'
Conflicts:
NEWS
Changed paths:
MM ext/mysqlnd/mysqlnd_net.c
Diff: