[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

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

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Annotate checks for functions with the version at which we can remove them

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Annotate check for g_hash_table_remove_all too

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Use tp_g_hash_table_update from telepathy-glib, if available