From: Victor Wagner <wagner@atlas-kard.ru>
Date: Thu, 1 Oct 2015 13:38:12 +0000 (+0300)
Subject: Merge commit '13dcbd1' into object_db
X-Git-Url: http://wagner.pp.ru/gitweb/?a=commitdiff_plain;h=af2081bb52dd1b222af3f1ecb07a04b7eacd11d7;p=openssl-gost%2Fengine.git

Merge commit '13dcbd1' into object_db

Conflicts:
	Makefile
---

af2081bb52dd1b222af3f1ecb07a04b7eacd11d7