]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f029a28 0765623)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 1 Jun 2015 00:29:53 +0000 (17:29 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 1 Jun 2015 00:29:53 +0000 (17:29 -0700)
* PHP-5.4:
  improve fix for Bug #69545

1  2 
ext/ftp/ftp.c patch | diff1 | diff2 | blob | history

diff --cc ext/ftp/ftp.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.