]> Cypherpunks.ru repositories - govpn.git/commitdiff
Merge branch 'develop' 7.0
authorSergey Matveev <stargrave@stargrave.org>
Sat, 29 Oct 2016 17:43:35 +0000 (20:43 +0300)
committerSergey Matveev <stargrave@stargrave.org>
Sat, 29 Oct 2016 17:43:35 +0000 (20:43 +0300)

Trivial merge