[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>
    Require telepathy-glib 0.7.13 (for Requests-related functions)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabblePrivateTubesFactory: remove useless connecting/connected/disconnected callbacks

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleIMChannel: use tp_text_mixin_has_pending_messages (requires telepathy-glib 0.7.13)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleImFactory: remove unnecessary forward-declaration

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMucFactory: document disco_requests