[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  telepathy-gabble-daf

Changes:

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    use exception.args[0] instead of exception.message, for Python 2.4 compatibility

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    disable test-google-roster.py as it fails with Python 2.4

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    remove unused check-extra rule

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    make top-level check-twisted depend on all, not check

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    add check-all rule for convenience

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    give MUC contacts their own alias source with higher priority than vCard

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    add test for MUC aliases