[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/smcv/public_html/darcs/salut-smcv-trivia

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-contact.h: kill trailing whitespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-avahi-service-resolver.h: kill trailing whitespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-connection.c: kill trailing whitespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-avahi-service-browser.h: kill trailing whitespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-muc-channel.c: kill trailing whitespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-avahi-entry-group.c: trailing whitespace must die

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-avahi-record-browser.h: kill trailing whitespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-contact-channel.c: kill trailing whitespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-connection-manager.c: kill trailing whitespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-contact-manager.h: kill trailing whitespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-avahi-record-browser.c: kill trailing whitespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-contact.c: kill trailing whitespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-muc-channel.h: kill trailing whitespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-self.c: kill trailing whitespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    /salut-avahi-entry-group.h: kill trailing whitespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-avahi-service-resolver.c: kill trailing whitespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-avahi-client.c: trailing whitespace must die

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-contact-manager.c: kill trailing whitespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    text-helper.c: kill trailing whitespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-muc-manager.h: kill trailing whitespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-muc-manager.c: kill trailing whitespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    text-helper.h: kill trailing whitespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-avahi-enums.h: kill trailing whitespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-avahi-service-browser.c: kill trailing whitespace