com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqlnd/m ysqlnd_result.c
| From: | Johannes Schlüter | Date: | Tue, 21 Jan 2014 15:37:02 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqlnd/m ysqlnd_result.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75722@lists.php.net to get a copy of this message | ||
Commit: 09eb3cf38119a488d0c7e40c30539008e78f2838
Author: Johannes Schlüter <johannes@php.net> Tue, 21 Jan 2014 16:37:02 +0100
Parents: 69581cdbbbdfcf20edbbc7d787ef2efe0fdc3822 5c964fb33266df24aa549dd653bd2271cc403925
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=09eb3cf38119a488d0c7e40c30539008e78f2838
Log:
Merge branch 'PHP-5.4' into PHP-5.5
Changed paths:
MM ext/mysqlnd/mysqlnd_result.c
Diff: