[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>
    Whitespace fixes

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    SalutMucManager: Keep an array of resolvers, so we can reflect finding multiple records for one room correctly

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Whitespace fixes

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    SalutMucManager: break if we found good parameters for the room to join

  Sjoerd Simons <sjoerd at luon.net>
    Fix some more style issues

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    SalutMucChannel: If we're connecting and the self handle is added.. Don't readd/restart connection