]> granicus.if.org Git - openssl/commitdiff
projects / openssl / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dac3654 ab0d964)
Merge branch 'mbland-heartbeat-test-1.0.1' into OpenSSL_1_0_1-stable
authorBen Laurie <ben@links.org>
Mon, 19 May 2014 17:26:04 +0000 (18:26 +0100)
committerBen Laurie <ben@links.org>
Mon, 19 May 2014 17:26:04 +0000 (18:26 +0100)

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