[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/sjoerd/telepathy-salut-sjoerd

Changes:

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Change the protocol name to ll-xmpp

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    SalutContactManager: Only dispose olpc specific hashtables when --enable-olpc is given

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    SalutConnectionManager: Rename the protocol to local-xmpp instead of ll-xmpp, like the new spec says

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Add debug output when setting the alias