From: martinko <gamato@users.sf.net>
Date: Tue, 3 Dec 2013 14:58:47 +0000 (+0100)
Subject: Merge branch 'hotfix/3.1.5.4'
X-Git-Tag: 3.1.5.4^0
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=3cfc1ad65876845641fbf2868994e6c6b53dd9ff;p=skytools.git

Merge branch 'hotfix/3.1.5.4'
---

3cfc1ad65876845641fbf2868994e6c6b53dd9ff