[Telepathy-commits] merge: telepathy-haze

[Merge Monkey]

Merge to:

  telepathy-haze

From:

  telepathy-haze-resiak

Changes:

  Will Thompson <will.thompson at collabora.co.uk>
    Fix turning incoming and outgoing linebreaks into spaces.

  Will Thompson <will at willthompson.co.uk>
    Add --enable-leaky-request-stubs to configure, defaulting to off.

  Will Thompson <will at willthompson.co.uk>
    Add a stub implementation of libpurple's request API to see what's being ignored.
This will cause leaks whenever a request call is made, since no callback is
ever called, but this is a small price to pay for information on why things
suddenly stop working.  Perhaps the default action should be taken in each
case?

  Will Thompson <will at willthompson.co.uk>
    Rename LEAKY_REQUEST_STUBS to ENABLE_LEAKY_REQUEST_STUBS.

  Will Thompson <will.thompson at collabora.co.uk>
    Document why &apos; is special-cased and that it need not be with libpurples newer than 2.3.1.