From: Sergey Matveev <stargrave@stargrave.org>
Date: Thu, 30 Apr 2015 16:34:38 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 2.4^0
X-Git-Url: http://www.git.cypherpunks.ru/?p=govpn.git;a=commitdiff_plain;h=b35c71524c2e2b2e8383212e617fc61486bdad88

Merge branch 'develop'

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

b35c71524c2e2b2e8383212e617fc61486bdad88