[Telepathy-commits] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

  /home/smcv/public_html/darcs/tp-glib-hash-table-update

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add tp_g_hash_table_update [re-recorded]

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    tp_g_hash_table_update: allow key_dup, value_dup to be NULL, which is equivalent to using this function: gpointer null_dup (gpointer p) { return p; }