[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/smcv/public_html/darcs/salut-smcv-ipv6

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Simplify selection of DNS record payload

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-muc-manager, salut-muc-channel: support IPv6 using AvahiAddress functions