]> Cypherpunks.ru repositories - govpn.git/commitdiff
projects / govpn.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e7ba034 e4a24ef)
Merge branch 'develop' 3.1
authorSergey Matveev <stargrave@stargrave.org>
Mon, 4 May 2015 16:48:03 +0000 (19:48 +0300)
committerSergey Matveev <stargrave@stargrave.org>
Mon, 4 May 2015 16:48:03 +0000 (19:48 +0300)
Signed-off-by: Sergey Matveev <stargrave@stargrave.org>

Trivial merge
Simple secure free software VPN daemon