From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 23 Aug 2015 14:43:27 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 3.5
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b163e382233835b57d4d2c059f0414c9e2cabae5;p=govpn.git

Merge branch 'develop'

Signed-off-by: Sergey Matveev <stargrave@stargrave.org>
---

296f3d2e9197b76209a4e86ed8856aea9195d94c