add our nexus repo info
Merge branch 'finagle_6_4_1' into thefactory_nexus
Merge branch 'master' into thefactory_nexus
Merge branch 'fix_select_prepared_statement' into thefactory_nexus
Merge branch 'insert_returning' into thefactory_nexus
Merge branch 'add_gets' into thefactory_nexus
Adds support for timestamps and enums
reverts to old StringValueEncoder
add hstore parsing
Merge branch 'master' into thefactory
Merge branch 'thefactory' of github.com:thefactory/finagle-postgres into thefactory
Merge branch 'add_hstore' into thefactory

Conflicts:
	src/main/scala/com/twitter/finagle/postgres/protocol/Values.scala
Merge remote-tracking branch 'origin/timestamp-enum-support' into additional_oids

Conflicts:
	src/main/scala/com/twitter/finagle/postgres/protocol/Values.scala
make this support hstore (and enums) properly
Merge branch 'additional_oids' into thefactory

Conflicts:
	src/main/scala/com/twitter/finagle/postgres/protocol/Values.scala
Switch the Scala version to 2.10.2

This patch also updates specs2 to version 1.14, which has
artifacts published for Scala 2.10.
fix a scala 2.10 regression issue
Merge branch 'additional_oids' into thefactory
saving hstore from a Map[String, String]
Merge branch 'additional_oids' into thefactory