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

[Xavier Claessens]

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

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Mon May 27 14:49:31 2013 +0200

Merge branch 'telepathy-haze-0.6'

Conflicts:
	src/im-channel.c

---