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^0
X-Git-Url: http://www.git.cypherpunks.ru/?p=govpn.git;a=commitdiff_plain;h=d3495f5a1d42c4cdeeeca5c8020efbd050fbde03

Merge branch 'develop'

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

d3495f5a1d42c4cdeeeca5c8020efbd050fbde03