[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/ftp/ftp.c

2013-10-20 Thread Rasmus Lerdorf
Commit:288a4ec3bd4a9e93d9cadc045d6ca9472081a3ec Author:Rasmus Lerdorf Sun, 20 Oct 2013 09:37:25 -0700 Parents: c5e5a6c2ac68b0007f3bfabd79cebe8163084b9f 8f4a6d6e1b6c36259a5dc865d16f0dad76f2f2c9 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdif

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/ftp/ftp.c

2013-10-20 Thread Rasmus Lerdorf
Commit:c5e5a6c2ac68b0007f3bfabd79cebe8163084b9f Author:Rasmus Lerdorf Sun, 20 Oct 2013 08:56:24 -0700 Parents: 8aa19c9fd8bcccd76d5246064fd4eab4e4b5c4f2 1494298231072d5991e76db5ef25f20e81018106 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdif