[Telepathy-commits] merge: telepathy-salut-0.2

[Merge Monkey]

Merge to:

  telepathy-salut-0.2

From:

  /home/sjoerd/telepathy-salut-0.2-sjoerd

Changes:

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    SalutMucManager: If setting up a resolver fails then we can get into a situation where a browser entry doesn't have a resolver. Handle this gracefully