New commits:
commit 29a2e8ad5bfb7b6d639a1ee097cbb46021465a1d
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: George Sherwood <gsherwood AT sourcemage.org>
krb5-appl: trailing && removed, #15732
(cherry picked from commit 97486f1afbd3cf46b22dae8102769beb29209650)
commit 319257849fe95c237e80b0c9e3503be8812f492e
Author: Robert Figura <template AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
krb5: CONFLICTS: netkit-telnet, telnet-bsd
(cherry picked from commit 96e57923ac6db0dc07253af154932075bd6bcf09)
commit 45378c7b6e56d7544046e7fd94c6db38cbc22e42
Author: Robert Figura <template AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
netkit-telnet: krb5-appl, telnet-bsd
(cherry picked from commit 118cbd7e6cc6ba8b39b89be159552a038729fc75)
commit 6fe2687d94564cb571f2204abf147cd2725076b3
Author: Robert Figura <template AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
telnet-bsd: CONFLICTS: krb5-appl, netkit-telnet
(cherry picked from commit 90d7e686fd1ef0da181ae9a28bd8e4b22d7cae55)