[next] telepathy-glib: Merge branch 'telepathy-glib-0.18'

[Jonny Lamb]

Module: telepathy-glib
Branch: next
Commit: 505fe8deebb5d45dbc6dc19c741c57b525fe8f50
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=505fe8deebb5d45dbc6dc19c741c57b525fe8f50

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Aug 13 10:56:31 2012 +0100

Merge branch 'telepathy-glib-0.18'

Conflicts:
	NEWS
	configure.ac

---