telepathy-qt: Merge branch 'dbus-tubes'

[Dario Freddi]

Module: telepathy-qt
Branch: master
Commit: 0823b3097377f3675ac500b2646f6b7c5c4187b0
URL:    http://cgit.freedesktop.org/telepathy/telepathy-qt/commit/?id=0823b3097377f3675ac500b2646f6b7c5c4187b0

Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Tue Jul  3 23:58:14 2012 +0200

Merge branch 'dbus-tubes'

Reviewed-by: George Kiagiadakis <george.kiagiadakis at collabora.com>
Reviewed-by: Andre Moreira Magalhaes <andre.magalhaes at collabora.co.uk>

---