From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 10 Jan 2016 14:08:58 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 5.1^0
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=a701f0dc18c15024298c84667e0edeea04e4cdf2;p=govpn.git

Merge branch 'develop'

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

a701f0dc18c15024298c84667e0edeea04e4cdf2