From: Sergey Matveev <stargrave@stargrave.org>
Date: Wed, 6 Jan 2016 16:36:16 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 5.0^0
X-Git-Url: http://www.git.cypherpunks.ru/?p=govpn.git;a=commitdiff_plain;h=9addeabf74df4ef01e4a10c9f960b362172524e8

Merge branch 'develop'

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

9addeabf74df4ef01e4a10c9f960b362172524e8