From: Robert Treat <rob@xzilla.net>
Date: Sat, 18 May 2013 22:15:06 +0000 (-0400)
Subject: Merge branch 'official'
X-Git-Tag: REL_7-12-1~33^2~39
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=8e59ea218458477471d4ef4ecf273de0d2ca94dd;p=phppgadmin.git

Merge branch 'official'
---

8e59ea218458477471d4ef4ecf273de0d2ca94dd