[empathy: 8/8] Merge branch 'more-contact-info'

[Will Thompson <wjt src gnome org>]

commit 45609a2304c805e1c05ba15e0856c9c41f020986
Merge: 383bf53 9c42c7a
Author: Will Thompson <will thompson collabora co uk>
Date:   Mon May 16 14:08:10 2011 +0100

    Merge branch 'more-contact-info'

 libempathy-gtk/empathy-chat.c           |   82 ++++++++++++++++
 libempathy-gtk/empathy-contact-widget.c |  159 +++++++++++++++++++++++++++++--
 libempathy/empathy-time.c               |   64 +++++++------
 libempathy/empathy-time.h               |    1 +
 4 files changed, 267 insertions(+), 39 deletions(-)
---