[Telepathy-commits] merge: telepathy-sofiasip

[Merge Monkey]

Merge to:

  telepathy-sofiasip

From:

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

Changes:

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    Don't pass a negative 'keepalive-interval' value to the stack, making it really a way to use stack's own defaults

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    SIPConnection: corrected the description string for 'keepalive-interval' to match the implementation