[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

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

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Set _olpc-activity txtvers to 0 and check for it

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Set _salut-room txtvers to 0