[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 allow dbus-daemon property of TpDBusDaemon to be set non-NULL. When getting dbus-daemon property of TpDBusDaemon, return itself

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Clarify TpPropertiesMixin documentation

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpPropertiesMixin: simplify string comparison by using tp_strdiff