[Telepathy-commits] merge: telepathy-gabble-0.6

[Merge Monkey]

Merge to:

  telepathy-gabble-0.6

From:

  /home/ptlo/public_html/darcs/gabble06-fixes-senko

Changes:

  Senko Rasic <senko.rasic at collabora.co.uk>
    fix function comment

  Senko Rasic <senko.rasic at collabora.co.uk>
    when blocking gtalk contacts, discard their presence