From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 11 Sep 2016 13:50:42 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 6.0^0
X-Git-Url: http://www.git.cypherpunks.ru/?p=govpn.git;a=commitdiff_plain;h=21dee974626eb44b6c3904621dea946fef7e17fc;hp=f9209136cff0331fc2293f25061971f6c77ff213

Merge branch 'develop'
---