From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 31 Jan 2016 15:50:28 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 5.4
X-Git-Url: http://www.git.cypherpunks.ru/?a=commitdiff_plain;h=eaff60c53e6a53cc950f1e2ed08cb82be01fd030;hp=4c8e5a136aba85dea639103c6618be46f7c41d49;p=govpn.git

Merge branch 'develop'

Signed-off-by: Sergey Matveev <stargrave@stargrave.org>
---