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
X-Git-Url: http://www.git.cypherpunks.ru/?a=commitdiff_plain;h=3e574c3cd84139c26e1ffc4d400a31f39d5172fc;p=govpn.git

Merge branch 'develop'
---

21dee974626eb44b6c3904621dea946fef7e17fc