[Telepathy-commits] merge: telepathy-sofiasip

[Merge Monkey]

Merge to:

  telepathy-sofiasip

From:

  /home/ptlo/public_html/telepathy-sofiasip/sofiasip-stuff

Changes:

  Senko Rasic <senko.rasic at collabora.co.uk>
    Ignoring non A-type results in STUN resolver query