From: Sergey Matveev <stargrave@stargrave.org>
Date: Tue, 24 Jan 2017 19:34:26 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 7.1
X-Git-Url: http://www.git.cypherpunks.ru/?a=commitdiff_plain;h=b900227f39e5a9a7a290d488334eb211635085d4;hp=b06cad4b275edf5077c5525e9faa85fee7d6282f;p=govpn.git

Merge branch 'develop'
---