[next] telepathy-glib: Merge commit ' 246e201a0ffcce7648b5cd3818ad889647b79ba5' into next

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri Sep 13 17:25:55 2013 +0100

Merge commit '246e201a0ffcce7648b5cd3818ad889647b79ba5' into next

Conflicts:
	telepathy-glib/dbus-properties-mixin-internal.h
	telepathy-glib/introspection.am
	tests/dbus/cm.c
	tests/lib/simple-conn.c

---