[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/sjoerd/tp-salut-arbitrary-entry-group/

Changes:

  Sjoerd Simons <sjoerd at luon.net>
    Don't do things with side-effects in asserts, bad!

  Sjoerd Simons <sjoerd at luon.net>
    Allow setting of arbitrary binary data in txt records

  Sjoerd Simons <sjoerd at luon.net>
    include avahi-common/malloc.h for the definition of avahi_free