diff options
author | Anatol Belski <ab@php.net> | 2014-08-12 11:52:07 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-08-12 11:52:07 +0200 |
commit | f50c50a1f8d0ff9e673baa70e3967c216af493bb (patch) | |
tree | b01a49dc64245a84ba70860d10c13dfd588511f9 /ext/mysql/php_mysql.c | |
parent | 54e8595f34aa1776e8158ac12ef5fd01b9634292 (diff) | |
parent | de18f42047af5635f23c3eeb404dd5a279b686a1 (diff) | |
download | php-git-f50c50a1f8d0ff9e673baa70e3967c216af493bb.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
updated NEWS
backported the fix for bug #41577
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions