GabbleMediaSession: merge conflict between locally_accepter/terminated
GabbleMediaSession: merge conflict between locally_accepter/terminated


20061024110610-418b8-12d56676d1a4caf49748c2eb66214576cdc3970f.gz

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