From: Sergey Matveev <stargrave@stargrave.org>
Date: Wed, 13 Jan 2016 19:37:56 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 5.2
X-Git-Url: http://www.git.cypherpunks.ru/?a=commitdiff_plain;h=eb2bdf0ac7e63b1f40907b0aa2812d6970fc281e;p=govpn.git

Merge branch 'develop'

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

1fea06143f0580f3d40a9ddbb1425ab613910155