From: Sergey Matveev <stargrave@stargrave.org>
Date: Sat, 29 Oct 2016 17:43:35 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 7.0
X-Git-Url: http://www.git.cypherpunks.ru/?a=commitdiff_plain;h=0288c9ab93711da8c4d42febf81b90d941ebd68b;p=govpn.git

Merge branch 'develop'
---

035ce75027dd6b55905c8719c0af3e09f80debc3