[Telepathy-commits] merge: telepathy-sofiasip

[Merge Monkey]

Merge to:

  telepathy-sofiasip

From:

  /home/smcv/public_html/darcs/tpsip-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove Hold interface from code generation, leaving code-gen machinery in place as a stub

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Use telepathy-glib 0.7.8 for Hold

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Require telepathy-glib 0.7.8 (for Hold)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Use tp-glib 0.7.8 for Hold in TpsipMediaSession too