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)

Trivial merge