Merge branch 'mbland-heartbeat-test-1.0.2' into OpenSSL_1_0_2-stable
authorBen Laurie <ben@links.org>
Mon, 19 May 2014 17:04:41 +0000 (18:04 +0100)
committerBen Laurie <ben@links.org>
Mon, 19 May 2014 17:04:41 +0000 (18:04 +0100)
commit6c1d36a649f4724bbcc261fdca3f90ae2a9fd563
treea5bb37eb89f83e65ecf1e061be2d6715e1e0ad50
parenta99d2a22e1f571560c08d2848ad6d9a71f34f662
parent2312a84ca17c5ac133581552df7024957cf15bc8
Merge branch 'mbland-heartbeat-test-1.0.2' into OpenSSL_1_0_2-stable