[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/smcv/public_html/darcs/salut-smcv-trivia

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    configure.ac: provide bug URL

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    SalutContactManager: whitespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    SalutMucManager: rename room_info to room_resolvers to indicate what it contains, add a comment