telepathy-haze: Merge branch 'telepathy-haze-0.8'

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Sep 24 12:08:12 2013 +0100

Merge branch 'telepathy-haze-0.8'

Conflicts:
	NEWS

---