[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

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

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    conn-olpc: unknow -> unknown

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    conn-olpc: use gabble_g_hash_table_update and gabble_g_value_slice_dup instead of reinventing them

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    re add comment about gabble_g_hash_table_update tp-glib inclusion

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Require telepathy-glib 0.5.14

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add casts to keep compiler happy

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Distribute TWISTED_TESTS in tarballs

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    use tp_g_value_slice_dup instead of our own implementation

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    test-muc-ownership, test-muc-properties: apply the same fix as to test-muc

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Regenerate _gen/enums.h and _gen/interfaces.h when the individual spec XML files change

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    test-muc: Relax assertion about exact event ordering