From: Sergey Matveev <stargrave@stargrave.org>
Date: Fri, 12 Feb 2016 08:04:52 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 5.6^0
X-Git-Url: http://www.git.cypherpunks.ru/?p=govpn.git;a=commitdiff_plain;h=124b8310c8fa341a8309ec71a295a7a0fb057950

Merge branch 'develop'
---

124b8310c8fa341a8309ec71a295a7a0fb057950