[empathy: 19/19] Merge branch 'message-editing-rebase'

[Danielle Madeley <daniellem src gnome org>]

commit 6e05d6a2c75fe87e76c509ba3bf73b4ab44e8a12
Merge: 1b47c6c 4f4c33a
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Mon Jun 20 11:06:48 2011 +0100

    Merge branch 'message-editing-rebase'

 configure.ac                         |    2 +-
 libempathy-gtk/empathy-chat-view.c   |   12 ++
 libempathy-gtk/empathy-chat-view.h   |    4 +
 libempathy-gtk/empathy-chat.c        |   69 ++++++++++---
 libempathy-gtk/empathy-images.h      |    2 +
 libempathy-gtk/empathy-log-window.c  |    9 ++-
 libempathy-gtk/empathy-theme-adium.c |  191 ++++++++++++++++++++++++++++++---
 libempathy/empathy-message.c         |  138 ++++++++++++++++++++++++-
 libempathy/empathy-message.h         |    4 +
 9 files changed, 392 insertions(+), 39 deletions(-)
---