From: Sergey Matveev <stargrave@stargrave.org>
Date: Fri, 13 Mar 2015 10:24:23 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 2.1
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=3763930ed2a15a1f5b58b7a99340a0e988266cb1;p=govpn.git

Merge branch 'develop'

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

ee417b7a377f2a099b11c632156bd8322fd21c3d