[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>
    TpsipConnection: removed useles TPSIP_IS_CONNECTION assertions

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    Backwards compatible use of environment variables SOFIASIP_PERSIST and SOFIASIP_DEBUG

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    TpsipConnection: commented out NUTAG_SIPS_URL assuming it's now rudimentary to NUTAG_URL

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    TpsipTextChannel: capitalized an error message

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    TpsipConnection: cosmetics in the class init function