]> Cypherpunks.ru repositories - govpn.git/commitdiff
Merge branch 'develop' 4.1
authorSergey Matveev <stargrave@stargrave.org>
Wed, 4 Nov 2015 10:00:02 +0000 (13:00 +0300)
committerSergey Matveev <stargrave@stargrave.org>
Wed, 4 Nov 2015 10:00:02 +0000 (13:00 +0300)
Signed-off-by: Sergey Matveev <stargrave@stargrave.org>

Trivial merge