| commit | 506a3d1f9cffeeba71c6f00bfe6701549bf24ff8 | [log] [tgz] |
|---|---|---|
| author | Rich Salz <rsalz@akamai.com> | Wed Aug 27 21:36:04 2014 -0400 |
| committer | Rich Salz <rsalz@akamai.com> | Wed Aug 27 21:36:36 2014 -0400 |
| tree | 5d6ba7cec67989d14e4e11e600617dd928c1be52 | |
| parent | 17e80c6bd05de7406a65116f34ed59665607d8d5 [diff] | |
| parent | f34a57202be4a5d3786ba65ad88d760aa02630f0 [diff] |
Merge branch 'master' of git.openssl.org:openssl Gah, I hate when I forget to pull before merging. Reviewed-by: rsalz