From: martinko <gamato@users.sf.net>
Date: Wed, 5 Nov 2014 15:00:53 +0000 (+0100)
Subject: Merge branch 'hotfix/3.2.6'
X-Git-Tag: 3.2.6^0
X-Git-Url: http://git.postgresql.org/gitweb/static/session/%22https:/www.citusdata.com/%7B%7Bp.id%7D%7D?a=commitdiff_plain;p=skytools.git

Merge branch 'hotfix/3.2.6'
---

82f9f365f386bc6f3d00c344fd2df1ca6f446346