[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>
    Emit activity-changed from contact even if it contains no room name. In contact-manager, cope with that by considering the activity advertisement to be absent

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix misleading debug messages

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Avoid unnecessary rebuilds by only replacing signals-marshal.list if needed