[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>
    Simplified log file diversion code on Simon's suggestions

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    Less cryptic comment for extra-realm auth parameters

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    Erased the unimplemented CM parameter 'avoid-difficult'

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    Divert log messages to a file if the file name is provided in the environment variable TPSIP_LOGFILE.
Fixes sf.net FR #1944067