[next] telepathy-haze: Merge branch 'deprecations' into next

[Simon McVittie]

Module: telepathy-haze
Branch: next
Commit: 5e712f11121a393e31d35e1365f0d08ebddc4785
URL:    http://cgit.freedesktop.org/telepathy/telepathy-haze/commit/?id=5e712f11121a393e31d35e1365f0d08ebddc4785

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon May  7 18:08:32 2012 +0100

Merge branch 'deprecations' into next

Conflicts:
	src/connection-avatars.c
	src/im-channel.c

---