From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 26 Apr 2015 16:42:13 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 2.3^0
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=3fd28e77fc57da509bde234f93324d30263aa493;p=govpn.git

Merge branch 'develop'

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

3fd28e77fc57da509bde234f93324d30263aa493