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)

Trivial merge