telepathy-haze: Merge branch 'telepathy-haze-0.6'

[Xavier Claessens]

Module: telepathy-haze
Branch: master
Commit: e91b3531384e1e75abdd039bc61a89c186f2b373
URL:    http://cgit.freedesktop.org/telepathy/telepathy-haze/commit/?id=e91b3531384e1e75abdd039bc61a89c186f2b373

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Mon May 27 13:58:35 2013 +0200

Merge branch 'telepathy-haze-0.6'

Conflicts:
	src/contact-list.c
	src/im-channel.c

---