]> Cypherpunks.ru repositories - govpn.git/commitdiff
Merge branch 'develop' 5.2
authorSergey Matveev <stargrave@stargrave.org>
Wed, 13 Jan 2016 19:37:56 +0000 (22:37 +0300)
committerSergey Matveev <stargrave@stargrave.org>
Wed, 13 Jan 2016 19:37:56 +0000 (22:37 +0300)
Signed-off-by: Sergey Matveev <stargrave@stargrave.org>

Trivial merge