telepathy-idle: Merge branch 'catch-up'

[Simon McVittie]

Module: telepathy-idle
Branch: master
Commit: 382886e7dacd79b86dc72a38e9ef32d321d8ab95
URL:    http://cgit.freedesktop.org/telepathy/telepathy-idle/commit/?id=382886e7dacd79b86dc72a38e9ef32d321d8ab95

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed May 30 13:08:35 2012 +0100

Merge branch 'catch-up'

Conflicts:
	configure.ac
	src/idle-muc-channel.c

---