]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 5 Aug 2013 02:36:01 +0000 (19:36 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 5 Aug 2013 02:36:01 +0000 (19:36 -0700)
* PHP-5.4:
  First fixes for a 64bit compatible ftp extension


Trivial merge