From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 3 May 2015 12:52:16 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 3.0^0
X-Git-Url: http://www.git.cypherpunks.ru/?p=govpn.git;a=commitdiff_plain;h=e7ba034dd3beb3f8f54c4d2e0f858eb23f58c147

Merge branch 'develop'

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

e7ba034dd3beb3f8f54c4d2e0f858eb23f58c147