]> granicus.if.org Git - openssl/commitdiff
Merge remote-tracking branch 'trevp/pempick' into OpenSSL_1_0_2-stable
authorBen Laurie <ben@links.org>
Tue, 24 Sep 2013 11:47:54 +0000 (12:47 +0100)
committerBen Laurie <ben@links.org>
Tue, 24 Sep 2013 11:47:54 +0000 (12:47 +0100)

Trivial merge