resolve merge conflict in disco callback
resolve merge conflict in disco callback


20060526164625-b59df-af8dc8e5e04030865038dfa579820f29322b12f9.gz

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