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

Trivial merge