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

[Merge Monkey]

Merge to:

  telepathy-gabble-0.4

From:

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

Changes:

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    rename confusing chan/schan variables in roster to pub_chan and sub_chan

  Senko Rasic <senko.rasic at collabora.co.uk>
    roster.c: don't remove handles from subscribe/known lists if they're remote pending in subscribe list

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    bump version to 0.4.14