[Telepathy-commits] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

  /home/smcv/public_html/darcs/tp-glib-smcv-dbus-daemon

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove now-unnecessary casts in TpConnectionManager

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Hoist declaration of TpDBusDaemon type (only) into proxy.h so the dbus_daemon member can become a TpDBusDaemon *