From: Sergey Matveev <stargrave@stargrave.org>
Date: Mon, 4 May 2015 16:48:03 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 3.1^0
X-Git-Url: http://www.git.cypherpunks.ru/?p=govpn.git;a=commitdiff_plain;h=facdacb23b4544ac07ad5fc153c82bfed505fee2

Merge branch 'develop'

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

facdacb23b4544ac07ad5fc153c82bfed505fee2