Resolve conflict in gabbletest: addition of start= vs addition of authenticator=, protocol=
Resolve conflict in gabbletest: addition of start= vs addition of authenticator=, protocol=


20070619121151-53eee-c08c79efe94d8f6d5a49f882f81304745866c993.gz

community-ssu/telepathy-gabble,Ziemin/telepathy-gabble,community-ssu/telepathy-gabble,jku/telepathy-gabble,community-ssu/telepathy-gabble,mlundblad/telepathy-gabble,Ziemin/telepathy-gabble,community-ssu/telepathy-gabble,jku/telepathy-gabble,jku/telepathy-gabble,Ziemin/telepathy-gabble,mlundblad/telepathy-gabble,Ziemin/telepathy-gabble,mlundblad/telepathy-gabble