[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/smcv/public_html/darcs/salut-olpc-ip4-address-hack

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add ip4-address and ip6-address as known buddy properties

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Correct misleading comment: there are >3 known properties now

  Dan Williams <dcbw at redhat.com>
    Put IPv4 and IPv6 addresses into buddy properties

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    fix conflict with the IP buddy property patch

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove SALUT_CONTACT_OLPC_IP4, SALUT_CONTACT_OLPC_IP6 bitfield flags (both are equivalent to SALUT_CONTACT_OLPC_PROPERTIES)