Merge to: telepathy-salut From: /home/cassidy/public_html/darcs/telepathy-salut-cassidy Changes: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk> gibber-tcp-transport.c: getaddrinfo uses gai_strerror and not errno for error reporting