bad rebase conflict resolution fix: the muc manager is not a factory anymore
bad rebase conflict resolution fix: the muc manager is not a factory anymore

freedesktop-unofficial-mirror/telepathy__telepathy-salut,freedesktop-unofficial-mirror/telepathy__telepathy-salut,freedesktop-unofficial-mirror/telepathy__telepathy-salut,freedesktop-unofficial-mirror/telepathy__telepathy-salut