[Telepathy] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/smcv/public_html/darcs/gabble-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix check for trailing whitespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    autogen.sh: Respect --no-configure