[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/smcv/public_html/darcs/gabble-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix comments at the top of the OLPC tests

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Correctly add activities to buddies' activity sets even if the buddy already had an activity set (laptop.org #4694)