Merge branch 'heartbeat-test' of git://github.com/mbland/openssl
authorBen Laurie <ben@links.org>
Thu, 22 May 2014 21:00:17 +0000 (22:00 +0100)
committerBen Laurie <ben@links.org>
Thu, 22 May 2014 21:00:17 +0000 (22:00 +0100)
commit27da9394905d6af6c5c522538ececc6dacc4d250
treea9e5aad37b39939d3dc2b93668c516c0f4491556
parenteb33348879938a073a9941e4ca21da21a27e04df
parent647c70f765aed4e913afb1c9f47377f7513c5c82
Merge branch 'heartbeat-test' of git://github.com/mbland/openssl