projects / oweals / openssl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd3c21b dd13aad)
Empty merge
authorRich Salz <rsalz@openssl.org>
Mon, 8 Sep 2014 14:44:04 +0000 (10:44 -0400)
committerRich Salz <rsalz@openssl.org>
Mon, 8 Sep 2014 14:45:31 +0000 (10:45 -0400)
Merge branch 'OpenSSL_1_0_2-stable' of git.openssl.org:openssl into OpenSSL_1_0_2-stable

Reviewed-by: Dr. Stephen Henson <steve@openssl.org>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.