[next] telepathy-spec: Merge branch 'trivia'

[Simon McVittie]

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

Author: Andre Moreira Magalhaes (andrunko) <andre.magalhaes at collabora.co.uk>
Date:   Tue Apr  3 15:44:04 2012 -0300

Merge branch 'trivia'

Reviewed-by: Simon McVittie <simon.mcvittie at collabora.co.uk>

---