]> Cypherpunks.ru repositories - govpn.git/commitdiff
Merge branch 'develop' 3.3
authorSergey Matveev <stargrave@stargrave.org>
Wed, 20 May 2015 09:56:11 +0000 (12:56 +0300)
committerSergey Matveev <stargrave@stargrave.org>
Wed, 20 May 2015 09:56:11 +0000 (12:56 +0300)
Signed-off-by: Sergey Matveev <stargrave@stargrave.org>

Trivial merge