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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Sep 17 17:54:53 2013 +0100

Merge branch 'telepathy-haze-0.8'

Conflicts:
	NEWS

---