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

[Guillaume Desmottes]

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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Fri Feb 14 13:54:02 2014 +0100

Merge branch 'master' into next-merge

---