From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 24 May 2015 08:39:17 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 3.4
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=5a7a42d3debac05e63203a6a286d8f051d3990f4;p=govpn.git

Merge branch 'develop'

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

f9b0c70547abc7275dadb649f35ab3d0964bb575