com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/ftp/ftp.c
| From: | Nikita Popov | Date: | Mon, 30 Dec 2013 12:54:58 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/ftp/ftp.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75504@lists.php.net to get a copy of this message | ||
Commit: c7ee97eea0c5ab23835f1fc1523c7c3e118d29d0
Author: Nikita Popov <nikic@php.net> Mon, 30 Dec 2013 13:54:58 +0100
Parents: ed5be4f7ad9255f13f0e1263e0b88181dc3c31d8 3b6afb1bd63ef92f9914867f04bedeea90e21789
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c7ee97eea0c5ab23835f1fc1523c7c3e118d29d0
Log:
Merge branch 'PHP-5.4' into PHP-5.5
Changed paths:
MM ext/ftp/ftp.c
Diff: