[Telepathy-commits] merge: telepathy-sofiasip

[Merge Monkey]

Merge to:

  telepathy-sofiasip

From:

  /home/zabaluev/public_html/darcs/telepathy-sofiasip-channel-flags-fix

Changes:

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    SIPMediaChannel: rescinding is meaningless for incoming calls, don't set the flag

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    Purged a meaningless channel group change that's been commented out for long

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    Disallow adding members to an incoming call channel (sf.net bug #1840543)