Merge remote-tracking branch 'upstream/master'

README.md

@@ -0,0 +1,7 @@
+# goftp #
+
+A FTP client package for Go
+
+## Documentation ##
+
+http://godoc.org/github.com/jlaffaye/goftp

client_test.go

@@ -104,6 +104,7 @@ func TestConn(t *testing.T) {
 	}
 }
 
+// ftp.mozilla.org uses multiline 220 response
 func TestConn2(t *testing.T) {
 	c, err := Connect("ftp.mozilla.org:21")
 	if err != nil {
@@ -119,4 +120,6 @@ func TestConn2(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	}
+
+	c.Quit()
 }

parse_test.go

@@ -1,11 +1,10 @@
 package ftp
 
 import (
-	"time"
 	"testing"
+	"time"
 )
 
-
 var thisYear, _, _ = time.Now().Date()
 
 type line struct {