[Telepathy-commits] merge: stream-engine

[Merge Monkey]

Merge to:

  stream-engine

From:

  /home/smcv/public_html/darcs/stream-engine-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    api/Makefile.am: Fix out-of-tree builds by allowing headers from $(top_builddir)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update tools/ from telepathy-glib

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update api/ to generate client-side stuff and docs too