Merge branch 'master' into jsonb_and_hstore
authorPeter Geoghegan <pg@heroku.com>
Sun, 16 Mar 2014 08:48:11 +0000 (01:48 -0700)
committerPeter Geoghegan <pg@heroku.com>
Sun, 16 Mar 2014 08:48:11 +0000 (01:48 -0700)
commitff8558f1faeac97d7bc39a9730c77bbbf382abe5
tree5386e59595b6a8e9e47bb95c484a28829c784ff2
parent0fdda610eec93bb115fc298884a5597bd7da5141
parente3c9f23250fc445568b2aefab8bcdc25371cff5b
Merge branch 'master' into jsonb_and_hstore

Conflicts:
src/include/catalog/pg_amproc.h
src/include/catalog/pg_amproc.h
src/include/catalog/pg_proc.h
src/test/regress/expected/opr_sanity.out