[empathy/gnome-3-2: 7/7] Merge branch 'subjective' into gnome-3-2

[Will Thompson <wjt src gnome org>]

commit 0bf6ee3a15d15cb80c5835d33bf899b2404da053
Merge: 470d731 e623416
Author: Will Thompson <will thompson collabora co uk>
Date:   Fri Oct 14 18:07:42 2011 +0100

    Merge branch 'subjective' into gnome-3-2

 configure.ac                         |    2 +-
 libempathy-gtk/empathy-chat.c        |   68 +++----
 libempathy-gtk/empathy-theme-adium.c |   10 +-
 libempathy/empathy-tp-chat.c         |  365 +++++++++++++++-------------------
 libempathy/empathy-tp-chat.h         |   22 +--
 5 files changed, 199 insertions(+), 268 deletions(-)
---