[Telepathy] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/cassidy/public_html/darcs/telepathy-gabble-olpc-cassidy

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bump nano version to be able to receive olpc PEP notifications

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    use "to" arg when calling lm_message_build so we don't need to manually add it as attribute

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    remove 2 trailing spaces