more conflict resolution
more conflict resolution


20060125182703-25e70-0cdc11aecd3c3c3c8050b415840afbe7ac79df17.gz

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