com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqlnd/m ysqlnd_ps_codec.c
| From: | Andrey Hristov | Date: | Mon, 08 Jul 2013 18:24:58 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqlnd/m ysqlnd_ps_codec.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72596@lists.php.net to get a copy of this message | ||
Commit: 3dd5f4ae4c91d97ed02f74cc849075a7d5c1a92c
Author: Andrey Hristov <andrey@php.net> Mon, 8 Jul 2013 20:24:58 +0200
Parents: 781be5f1d74ea9406e9ab82f9f90844befcc67b3 9fc38183b707341b6eddb8c196d0ea2b7c13d6a9
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3dd5f4ae4c91d97ed02f74cc849075a7d5c1a92c
Log:
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
NEWS
Changed paths:
MM ext/mysqlnd/mysqlnd_ps_codec.c
Diff: