From: Sergey Matveev <stargrave@stargrave.org>
Date: Wed, 20 May 2015 09:56:11 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 3.3
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=c828251f51e15f099e532b6e794893b2c285dcf2;p=govpn.git

Merge branch 'develop'

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

46043bf7ed8bfbbb03e2c4821fc7eab09ddb32f7