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

[Simon McVittie]

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

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

Merge branch 'trivia'

Reviewed-by: Jonny Lamb <jonny.lamb at collabora.co.uk>

---