From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 15 Nov 2015 15:20:39 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 4.2^0
X-Git-Url: http://www.git.cypherpunks.ru/?p=govpn.git;a=commitdiff_plain;h=9de9bda535fa09950b8702181ba69d60efde9ac4

Merge branch 'develop'

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

9de9bda535fa09950b8702181ba69d60efde9ac4