[empathy: 10/10] Merge branch 'highlight-regex'

[Will Thompson <wjt src gnome org>]

commit ddd8a9a000833d87260f81c4459063b32e2e14e7
Merge: 6b453cf cb4d749
Author: Will Thompson <will willthompson co uk>
Date:   Wed Jan 25 16:01:32 2012 +0000

    Merge branch 'highlight-regex'

 libempathy-gtk/empathy-chat-text-view.c |    6 +-
 libempathy-gtk/empathy-chat-text-view.h |    3 +-
 libempathy-gtk/empathy-chat-view.c      |    6 +-
 libempathy-gtk/empathy-chat-view.h      |    6 +-
 libempathy-gtk/empathy-chat.c           |  153 +++++++++++++++++++++++++++++--
 libempathy-gtk/empathy-theme-adium.c    |   19 +++--
 libempathy-gtk/empathy-theme-boxes.c    |    3 +-
 libempathy-gtk/empathy-theme-irc.c      |    5 +-
 libempathy/empathy-message.c            |   69 --------------
 libempathy/empathy-message.h            |    1 -
 libempathy/empathy-tp-chat.c            |   19 ++++
 src/empathy-chat-window.c               |    3 +-
 src/empathy-preferences.c               |   16 ++--
 13 files changed, 205 insertions(+), 104 deletions(-)
---