]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorRasmus Lerdorf <rasmus@lerdorf.com>
Sun, 20 Oct 2013 03:56:01 +0000 (20:56 -0700)
committerRasmus Lerdorf <rasmus@lerdorf.com>
Sun, 20 Oct 2013 03:56:01 +0000 (20:56 -0700)
commit683a7d719bd2ff7fcf030987cc31e57199fe79a5
treeb726e23130dd3193e19211aa72bc8aba7ac1fd18
parent0d6247f9683a8ba36bba30ad3bb8f3e01bc6dfdf
parentfb38fdc7fd97f1e057b8c9d9102ce8a39b430f81
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Remove senseless check here
ext/ftp/ftp.c