Merge branch 'master' into cypher_comments

Conflicts: database.go
jmcvetta · Oct 11, 2014 · f66a3d0 · f66a3d0
2 parents 588a8cc + a742e68
commit f66a3d0
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/database.go b/database.go
@@ -44,6 +44,9 @@ func Connect(uri string) (*Database, error) {
 	if err != nil {
 		return nil, err
 	}
+	if parsedUrl.User != nil {
+		db.Session.Userinfo = parsedUrl.User
+	}
 	return connectWithRetry(db, parsedUrl, 0)
 }