[next] telepathy-idle: Merge branch 'master' into next-merge

[Guillaume Desmottes]

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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Wed Jan 29 17:31:05 2014 +0100

Merge branch 'master' into next-merge

Conflicts:
	configure.ac
	extensions/Connection_Interface_Renaming.xml
	src/idle-connection.c
	tests/twisted/constants.py

---