telepathy-idle: Merge branch 'telepathy-idle-0.2'

[Guillaume Desmottes]

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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Thu Oct  3 14:16:49 2013 +0200

Merge branch 'telepathy-idle-0.2'

Conflicts:
	configure.ac

---