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=refs%2Ftags%2F7.1;hp=-c;p=govpn.git

Merge branch 'develop'
---

eb63bd7cb200da72cc782f4fef873ebfdc6c0eba