[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/smcv/public_html/darcs/gabble-smcv-trivia

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    gabble_xmpp_error_from_node: g_return_if_fail (error_node != NULL, INVALID_XMPP_ERROR)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Get rid of gabble-signals-marshal.list in distclean