From: martinko <gamato@users.sf.net>
Date: Wed, 5 Nov 2014 14:59:38 +0000 (+0100)
Subject: Merge branch 'develop' into hotfix/3.2.6
X-Git-Tag: 3.2.6^2~1
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=02b122469a29b10ae18960436f277ef4eed8121f;p=skytools.git

Merge branch 'develop' into hotfix/3.2.6
---

02b122469a29b10ae18960436f277ef4eed8121f