From: Andreas Scherbaum <andreas@scherbaum.biz>
Date: Mon, 25 Jun 2012 21:28:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/v2' into v2
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=d492ab87713a77afe5a1cefedadf2f3b8fecc540;p=docbot.git

Merge remote-tracking branch 'origin/v2' into v2
---

d492ab87713a77afe5a1cefedadf2f3b8fecc540