]> Cypherpunks.ru repositories - govpn.git/commitdiff
Merge branch 'develop' 2.3
authorSergey Matveev <stargrave@stargrave.org>
Sun, 26 Apr 2015 16:42:13 +0000 (19:42 +0300)
committerSergey Matveev <stargrave@stargrave.org>
Sun, 26 Apr 2015 16:42:13 +0000 (19:42 +0300)
Signed-off-by: Sergey Matveev <stargrave@stargrave.org>

Trivial merge