]> wagner.pp.ru Git - openssl-gost/engine.git/commitdiff
Merge commit '13dcbd1' into object_db
authorVictor Wagner <wagner@atlas-kard.ru>
Thu, 1 Oct 2015 13:38:12 +0000 (16:38 +0300)
committerVictor Wagner <wagner@atlas-kard.ru>
Thu, 1 Oct 2015 13:38:12 +0000 (16:38 +0300)
Conflicts:
Makefile


Trivial merge