[Telepathy-commits] merge: telepathy-haze

[Merge Monkey]

Merge to:

  telepathy-haze

From:

  telepathy-haze-resiak

Changes:

  Will Thompson <will.thompson at collabora.co.uk>
    Support HAZE_LOGFILE for diverting stdout and stderr

  Will Thompson <will.thompson at collabora.co.uk>
    Set up tp-glib debug before initializing libpurple.
Previously, some debugging output was emitted before divert_messages() was
called.

  Will Thompson <will.thompson at collabora.co.uk>
    Drop #ifdefs for telepathy-glib <0.7 given that it's a dependency