]> Cypherpunks.ru repositories - govpn.git/commitdiff
Merge branch 'develop' 4.0
authorSergey Matveev <stargrave@stargrave.org>
Sat, 19 Sep 2015 20:26:49 +0000 (23:26 +0300)
committerSergey Matveev <stargrave@stargrave.org>
Sat, 19 Sep 2015 20:26:49 +0000 (23:26 +0300)
Signed-off-by: Sergey Matveev <stargrave@stargrave.org>

Trivial merge