[Telepathy-commits] merge: telepathy-sofiasip

[Merge Monkey]

Merge to:

  telepathy-sofiasip

From:

  /home/ptlo/public_html/telepathy-sofiasip/sofia-stun-resolv

Changes:

  Senko Rasic <senko.rasic at collabora.co.uk>
    SIPConnection: a small fix in stun server address free

  Senko Rasic <senko.rasic at collabora.co.uk>
    SIPConnection: don't try to resolve stun address if it's already an IP address