[Telepathy-commits] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

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

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove tp_iface_quark_channel_interface_hold from docs

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove resource limits in text-mixin.c (no longer needed)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpTextMixin: trivial coding style fixes