From: Sergey Matveev <stargrave@stargrave.org>
Date: Sat, 6 Feb 2016 14:53:08 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 5.5^0
X-Git-Url: http://www.git.cypherpunks.ru/?p=govpn.git;a=commitdiff_plain;h=5418a3da373c4e87b34babba6cc754b7bd57ed1b;hp=aef4a7b44d3f7b1213555ea61d0c5c34c1fc322c

Merge branch 'develop'

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