From: Kevin Grittner <Kevin.Grittner@wicourts.gov>
Date: Sun, 18 Sep 2011 17:33:49 +0000 (-0500)
Subject: Merge branch 'master' into serializable
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=470c093fae91edf046ba695157e2d59d2198c02f;p=users%2Fkgrittn%2Fpostgres.git

Merge branch 'master' into serializable

Conflicts:
	src/backend/access/heap/heapam.c
	src/test/isolation/expected/prepared-transactions.out
	src/test/isolation/expected/prepared-transactions_1.out
---

470c093fae91edf046ba695157e2d59d2198c02f