[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/cassidy/public_html/darcs/telepathy-gabble-build-fix

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: use g_return_val_if_reached instead of g_assert_not_reached to make some compiler happy (fd #13752)

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-stream: use g_return_val_if_reached instead of g_assert_not_reached to make some compiler happy (fd #13752)