[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>
    _got_self_avatar_for_get_known_avatar_tokens: in the corner case of us starting disconnect right after GetKnownAvatarTokens call but before our own token is known, don't report bogus handle 0 to the user

  Senko Rasic <senko.rasic at collabora.co.uk>
    don't try to gracefully avoid a bug if it's there; assert what can't happen, and fix the bug if and when it happens