[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>
    debug.h: use better definition of DEBUG and NODE_DEBUG in the non-debug case

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    debug.h: NODE_DEBUG: allow s argument to be non-literal (and don't break if it contains %)