[Telepathy-commits] merge: telepathy-sofiasip

[Merge Monkey]

Merge to:

  telepathy-sofiasip

From:

  /home/zabaluev/public_html/darcs/telepathy-sofiasip-misc

Changes:

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    TpsipMediaSession: added debug tracing for remote hold status update

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    Ported the pending offer/pending remote send state interaction fix to the trunk

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    Don't remove or apply the remote pending send flag if there is a pending SDP offer