From: martinko <gamato@users.sf.net>
Date: Wed, 9 Apr 2014 15:21:43 +0000 (+0200)
Subject: Merge branch 'develop' into hotfix/3.2.1
X-Git-Tag: 3.2.1^2~4
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=07c560c5f3a8b51cb4a492bff8af191fb60edc9a;p=skytools.git

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

07c560c5f3a8b51cb4a492bff8af191fb60edc9a