* master:
  Add Inflection test (and fixes) to ensure singularizing a singular actually give you the correct singular in more cases

Add Inflection test (and fixes) to ensure singularizing a singular actually give you the correct singular in more cases

* joelhoffman-postgres_schema_builder:
  Also support writing the hstore back to the database
  Hstore values are all strings
  string_to_hstore / hstore_to_string, serializing
  don't test schema where hstore not installed
  schema dumper tests for hstore
  Additional hstore tests, supporting null values, better compliance with postgres docs
  add hstore to postgres native types and defaults

Conflicts:
	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

* master:
  Fix GH #4720. Routing problem with nested namespace and already camelized controller option.
  make Range#overlaps? accept Range of Time
  improved test case for partial indices
  Made schema dumper recognize partial indices' where statements
  Added where option to add_index to support postgresql partial indices

Add support for partial indices to PostgreSQL adapter

make Range#overlaps? accept Range of Time

Fix GH #4720. Routing problem with nested namespace and already camelized controller option.

* master: (30 commits)
  Bump tzinfo. 0.3.31 was released on November 6, 2011.
  Fix GH #4909. Dependency on TZInfo move from AR to AS.
  moving ordered hash to normal hash because ruby 1.9.3 hash defaultly ordered one
  Refactored the OrderedHash related stuff
  Replaced OrderedHash usage with Ruby 1.9 Hash
  Replaced OrderedHash with Hash for ruby 1.9 series
  removed unnecessary code
  replacing the orderhash with hash for ruby-1.9
  Clean up some wording.
  Fix typo.
  test title changed corresponding to the test
  replaced active support ordered hash to ruby hash on active resource
  PostgreSQL does not work in the same way of the other adapters
  AR::Relation#pluck: improve to work with joins
  Fix match docs
  Fix attribute_before_type_cast for serialized attributes. Fixes #4837.
  Fix failing request test
  Fixes in AMo README
  Update README to mention lint.
  Trim down Active Model API by removing valid? and errors.full_messages
  ...

Conflicts:
	activerecord/lib/active_record/relation/query_methods.rb

Bump tzinfo. 0.3.31 was released on November 6, 2011.

Fix GH #4909. Dependency on TZInfo move from AR to AS.

Replaced OrderedHash usage with Ruby 1.9 Hash

Refactored the OrderedHash related stuff

moving ordered hash to normal hash because ruby 1.9.3 hash defaultly ord...

Replaced OrderedHash with Hash for ruby 1.9 series

replacing the orderhash with hash for ruby-1.9

removed unnecessary code