telepathy-qt: Merge branch 'tp-glib-0.18'

[Dario Freddi]

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

Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Mon Aug 27 19:37:49 2012 +0200

Merge branch 'tp-glib-0.18'

Reviewed-by: George Kiagiadakis <george.kiagiadakis at collabora.com>

---