[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

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

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-dbus: get_tube_state: add a g_return_val_if_reached to make facist gcc happy

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-dbus: get_tube_state: replace g_assert_not_reached by g_return_val_if_reached