[next] telepathy-haze: Merge branch 'telepathy-haze-0.8'

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Oct  2 18:55:09 2013 +0100

Merge branch 'telepathy-haze-0.8'

Conflicts:
	NEWS
	configure.ac

---