[next] telepathy-haze: Merge branch 'master' into HEAD

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Nov  5 16:52:08 2013 +0000

Merge branch 'master' into HEAD

Conflicts:
	NEWS

---