[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/robot101/public_html/telepathy-gabble-rob

Changes:

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    fix hardcoded address type in GetStreamTubeAddress