]> Cypherpunks.ru repositories - govpn.git/commitdiff
projects / govpn.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee417b7 f2b5624)
Merge branch 'develop' 2.2
authorSergey Matveev <stargrave@stargrave.org>
Sun, 15 Mar 2015 16:10:07 +0000 (19:10 +0300)
committerSergey Matveev <stargrave@stargrave.org>
Sun, 15 Mar 2015 16:10:07 +0000 (19:10 +0300)
Signed-off-by: Sergey Matveev <stargrave@stargrave.org>

Trivial merge
Simple secure free software VPN daemon