telepathy-logger: Merge branch 'telepathy-logger-0.4'

[Danielle Madeley]

Module: telepathy-logger
Branch: master
Commit: 690726f7e0caf41d198f1110e02a45418c205612
URL:    http://cgit.freedesktop.org/telepathy/telepathy-logger/commit/?id=690726f7e0caf41d198f1110e02a45418c205612

Author: Danielle Madeley <danielle.madeley at collabora.co.uk>
Date:   Thu Apr 26 22:40:43 2012 +1000

Merge branch 'telepathy-logger-0.4'

---