[Telepathy-commits] merge: libtelepathy

[Merge Monkey]

Merge to:

  libtelepathy

From:

  /home/ptlo/public_html/libtelepathy/libtp-tubes-senko

Changes:

  Senko Rasic <senko.rasic at collabora.co.uk>
    Added support for Channel.Type.Text

  Senko Rasic <senko.rasic at collabora.co.uk>
    Fixed indentation in src/Makefile.am