~sbeattie/conflictchecker/conflictchecker-fixups

1
2
3
finger	finger-ldap [diverts]
bitchx	bitchx-ssl [diverts]