merge with upstream

hoegaarden · hoegaarden · commit 1d261962c014 · 2013-12-28T00:37:41.000+01:00
diff --git a/NEWS.md b/NEWS.md
@@ -4,6 +4,9 @@ For richer information consult the commit log on github with referenced pull req
 
 We do not include break-fix version release in this file.
 
+### v2.10.0
+- Add support for [the password file](http://www.postgresql.org/docs/9.3/static/libpq-pgpass.html)
+
 ### v2.9.0
 - Add better support for [unix domain socket](https://github.com/brianc/node-postgres/pull/487) connections
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pg",
-  "version": "2.9.0",
+  "version": "2.10.0",
   "description": "PostgreSQL client - pure javascript & libpq with the same API",
   "keywords": [
     "postgres",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "pg",`
`3`		`- "version": "2.9.0",`
	`3`	`+ "version": "2.10.0",`
`4`	`4`	`"description": "PostgreSQL client - pure javascript & libpq with the same API",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"postgres",`