]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorLior Kaplan <kaplanlior@gmail.com>
Tue, 15 Dec 2015 11:26:53 +0000 (13:26 +0200)
committerLior Kaplan <kaplanlior@gmail.com>
Tue, 15 Dec 2015 11:26:53 +0000 (13:26 +0200)
* PHP-7.0:
  Implement FR #55651 (Option to ignore the returned FTP PASV address)


Trivial merge