]> Cypherpunks.ru repositories - govpn.git/commitdiff
Merge branch 'develop' 3.5
authorSergey Matveev <stargrave@stargrave.org>
Sun, 23 Aug 2015 14:43:27 +0000 (17:43 +0300)
committerSergey Matveev <stargrave@stargrave.org>
Sun, 23 Aug 2015 14:43:27 +0000 (17:43 +0300)
Signed-off-by: Sergey Matveev <stargrave@stargrave.org>

Trivial merge