From: Sergey Matveev <stargrave@stargrave.org>
Date: Thu, 21 Jan 2016 09:28:36 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 5.3^0
X-Git-Url: http://www.git.cypherpunks.ru/?p=govpn.git;a=commitdiff_plain;h=a87ec543051d428aaa3888804d6c8451f6d537c9;hp=3fad5bcb9348ccb276db940c0c56e58790545ac4

Merge branch 'develop'

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