projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
17e80c6
f34a572
)
Merge branch 'master' of git.openssl.org:openssl
author
Rich Salz
<rsalz@akamai.com>
Thu, 28 Aug 2014 01:36:04 +0000
(21:36 -0400)
committer
Rich Salz
<rsalz@akamai.com>
Thu, 28 Aug 2014 01:36:36 +0000
(21:36 -0400)
Gah, I hate when I forget to pull before merging.
Reviewed-by: rsalz
Trivial merge