com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqli/my sqli_nonapi.c
| From: | Johannes Schlüter | Date: | Wed, 03 Jul 2013 14:58:20 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqli/my sqli_nonapi.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72575@lists.php.net to get a copy of this message | ||
Commit: 631bb27dcacf625e35f6dacc5e8df0b45624531a
Author: Johannes Schlüter <johannes@php.net> Wed, 3 Jul 2013 16:58:20 +0200
Parents: 5324416b6514b6de53e7de269bc18b5807701051 0265c2d961aa99e00361d6ab0f845dc1e8782558
Branches: PHP-5.5 master
Link: http://git.php..net/?p=php-src.git;a=commitdiff;h=631bb27dcacf625e35f6dacc5e8df0b45624531a
Log:
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
Zend/acinclude.m4
Changed paths:
MM ext/mysqli/mysqli_nonapi.c
Diff: