From: Sergey Matveev <stargrave@stargrave.org>
Date: Wed, 20 May 2015 09:56:11 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 3.3^0
X-Git-Url: http://www.git.cypherpunks.ru/?p=govpn.git;a=commitdiff_plain;h=46043bf7ed8bfbbb03e2c4821fc7eab09ddb32f7

Merge branch 'develop'

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

46043bf7ed8bfbbb03e2c4821fc7eab09ddb32f7