[Telepathy-commits] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

  /home/smcv/public_html/darcs/tp-glib-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Example CMs: consistently use static strings

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Example CM channel factories: use clearer function naming