[Telepathy] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

  /home/smcv/public_html/darcs/tp-glib-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix check for trailing whitespace

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    include Channel_Type_Tubes.xml

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update to the rest of spec 0.15.3

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add Tubes spec