[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqli/mysqli_nonapi.c ext/mysqlnd/mysqlnd.c ext/mysqlnd/mysqlnd.h

2013-12-04 Thread Andrey Hristov
Commit:ceb1b7e20fdbbdb121a67242d0848ab923915e65 Author:Andrey Hristov Wed, 4 Dec 2013 12:07:18 +0200 Parents: 00a7b1ff7fed49df51d0392d47aa79f63bf1c66e 86aad979798a665e3f23aafb200390d51d44f8fa Branches: PHP-5.5 PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdif

[PHP-CVS] com php-src: Merge branch 'PHP-5.6': NEWS configure.in main/main.c

2013-12-04 Thread Andrey Hristov
Commit:406d5a5ecc7a23eb2b157e066ddc09641854daf9 Author:Andrey Hristov Wed, 4 Dec 2013 16:20:03 +0200 Parents: dd7c33d0c9812df09a029d32451decb012d42629 97909ef4efb6756730b814c9966579ea6ec9e3ba Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=406d5