From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 31 Jan 2016 15:50:28 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 5.4^0
X-Git-Url: http://www.git.cypherpunks.ru/?p=govpn.git;a=commitdiff_plain;h=96b730405d6c9468e156a5386ca6b25a3bcdd3ec

Merge branch 'develop'

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

96b730405d6c9468e156a5386ca6b25a3bcdd3ec