]> Cypherpunks.ru repositories - govpn.git/commitdiff
Merge branch 'develop' 3.0
authorSergey Matveev <stargrave@stargrave.org>
Sun, 3 May 2015 12:52:16 +0000 (15:52 +0300)
committerSergey Matveev <stargrave@stargrave.org>
Sun, 3 May 2015 12:52:16 +0000 (15:52 +0300)
Signed-off-by: Sergey Matveev <stargrave@stargrave.org>

Trivial merge