]> granicus.if.org Git - php/commit
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)
commit8746163153157857fcb95b8ab33b77144d7ee7a8
tree71610772374530deb4ffb474b97638f6cabdf8e9
parentf029a2856b40dfb9093b85414c3e7419c43516f4
parent0765623d6991b62ffcd93ddb6be8a5203a2fa7e2
Merge branch 'PHP-5.4' into PHP-5.5

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