From: Simon Riggs <simon@2ndQuadrant.com>
Date: Tue, 6 Oct 2009 17:23:11 +0000 (+0100)
Subject: Merge branch 'master' into hot_standby
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=c33496dcacf21d0b7bbf3a6b9222d9116eda605b;p=users%2Fsimon%2Fpostgres.git

Merge branch 'master' into hot_standby
---

c33496dcacf21d0b7bbf3a6b9222d9116eda605b