tree 5c73c87f2eeba404f3e171fca597c69febc0f4c1
parent 141e767fa973c050bb7c1d39e457165c109ba78c
parent 9ebdcffef4d1841dc2e81f41c25ad200ac91e049
author Jaeden Amero <jaeden.amero@arm.com> 1534515715 +0100
committer Jaeden Amero <jaeden.amero@arm.com> 1534852703 +0100

Merge remote-tracking branch 'upstream-public/pr/1932' into development

Resolve conflicts in programs/ssl/ssl_mail_client.c. PR #930 already had
the fix, but not the comment. PR #1932 then just adds a comment about the
fix.