[empathy: 4/4] Merge remote-tracking branch 'danni/trivia'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 5cadb51ab2f92b5bf13fa7ca228d2f7a9d2fea56
Merge: 2b7e8c33 a8fbf02
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Fri Jan 27 11:14:26 2012 +0100

    Merge remote-tracking branch 'danni/trivia'

 libempathy-gtk/empathy-individual-store.c |  100 +++++++++++++++--------------
 libempathy-gtk/empathy-tls-dialog.c       |    1 +
 src/empathy-preferences.c                 |    6 +-
 src/empathy-preferences.ui                |   47 ++++++++++++--
 4 files changed, 97 insertions(+), 57 deletions(-)
---