[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/sjoerd/telepathy-salut-sjoerd-new-protocol

Changes:

  Sjoerd Simons <sjoerd at luon.net>
    Don't unnecessarily rstrip data

  Sjoerd Simons <sjoerd at luon.net>
    GibberRMulticastSender: Kill trailing whitespace