| commit | ed49eb4a48a11978d6ba8508fe9bae6794a20372 | [log] [tgz] |
|---|---|---|
| author | Rich Salz <rsalz@akamai.com> | Tue Aug 26 13:54:21 2014 -0400 |
| committer | Rich Salz <rsalz@akamai.com> | Tue Aug 26 13:55:13 2014 -0400 |
| tree | a0eef8facd4ffd7455fa0a109d86e84c7d8370c1 | |
| parent | fa60b909501664b2034d254781798e511d16c315 [diff] | |
| parent | a4d266b82438ee9792d68dbe694170502e5e38da [diff] |
Merge branch 'master' of git.openssl.org:openssl Stupid git tricks :( Reviewed-by: rsalz