Fix conflict: whitespace vs addition of Media_Session_Type, Media_Session_Handler_Info
Fix conflict: whitespace vs addition of Media_Session_Type, Media_Session_Handler_Info


20080306130059-53eee-a6c044103a53dfe11855fa3eccd73772a7bc8c87.gz

freedesktop-unofficial-mirror/telepathy__telepathy-spec,TelepathyIM/telepathy-spec