From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 10 May 2015 18:51:58 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 3.2
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=a4474a558318cfb127d48c361f1a611524d9446a;p=govpn.git

Merge branch 'develop'

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

d3495f5a1d42c4cdeeeca5c8020efbd050fbde03