]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Mon, 1 Jun 2015 00:30:41 +0000 (17:30 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 1 Jun 2015 00:30:41 +0000 (17:30 -0700)
commite0fb8c8b7f7cf85583ea38ab63a7776f29f1443b
tree74fd415bebaec2427e337bf1732fd0f0df159cc4
parent07241bbd70cce10518781705fdd9cc18b4692f0b
parent4758505b27dbfbade703d80737b9d50a9c2b9dea
Merge branch 'PHP-5.6'

* PHP-5.6:
  improve fix for Bug #69545
ext/ftp/ftp.c