[Telepathy] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove definition of NODE_DEBUG from telepathy-glib's internal-debug.h - it's a Gabble'ism

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add tp_debug_set_flags_from_string(). Make _tp_debug_flag_is_set() always return TRUE or FALSE. Document debug support.

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Allow multiple inclusion of internal-debug.h to change what the debug flag is