[empathy: 5/5] Merge branch 'reference-identities'

[Stefan Walter <stefw src gnome org>]

commit 6c5affb1f943b6685a0ac63adcfff24b47be6e2e
Merge: 5316d72 698675b
Author: Stef Walter <stefw collabora co uk>
Date:   Tue Mar 22 15:22:43 2011 +0100

    Merge branch 'reference-identities'
    
    Conflicts:
    	libempathy/empathy-server-tls-handler.c

 libempathy/empathy-server-tls-handler.c |   47 +++++++++++++++++++++++++++++-
 libempathy/empathy-tls-verifier.c       |   41 ++++++++++++++++++++++++--
 libempathy/empathy-tls-verifier.h       |    3 +-
 src/empathy-auth-client.c               |    6 +++-
 4 files changed, 89 insertions(+), 8 deletions(-)
---