[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/cassidy/public_html/darcs/telepathy-salut-cassidy

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-im-channel.c: tweak to fit Collabora coding style

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-im-channel.h: more coding style tweaks

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-im-channel.h: tweak to fit Collabora coding style