[next] telepathy-glib: Merge remote-tracking branch 'cassidy/tartan' into next

[Simon McVittie]

Module: telepathy-glib
Branch: next
Commit: 8f96d1f2789e7644d5208a101f7ee98433852d81
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=8f96d1f2789e7644d5208a101f7ee98433852d81

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Sep 17 13:17:39 2014 +0100

Merge remote-tracking branch 'cassidy/tartan' into next

Reviewed-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=79361

---