[Telepathy-commits] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

  /home/smcv/public_html/darcs/tp-glib-smcv-trivia

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Don't use $(builddir) in tests/dbus/Makefile.am (breaks build with older Automake)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    telepathy-glib 0.7.4 (libtool c:r:a = 7:1:7)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Prepare version 0.7.4 (libtool: c:r:a = 7:1:7)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Bump nano version to 1