From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 13 Mar 2016 08:55:54 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 5.7
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=ff464f8c46e69a2a053c405ec588ab701faf8957;p=govpn.git

Merge branch 'develop'
---

cee89cfdfbc6b2b429d56f0b420bc5b981e475b8