[empathy: 2/2] Merge branch 'menu'

[Xavier Claessens <xclaesse src gnome org>]

commit 1c1c28d84322625bcd83aae9e705c00bbc2095d6
Merge: d6d5fd2 41f9f0a
Author: Xavier Claessens <xclaesse gmail com>
Date:   Wed Feb 10 20:14:43 2010 +0100

    Merge branch 'menu'

 libempathy-gtk/empathy-contact-list-view.c |    4 ++++
 libempathy-gtk/empathy-contact-menu.c      |    1 -
 libempathy-gtk/empathy-contact-widget.c    |    3 ++-
 libempathy-gtk/empathy-theme-adium.c       |    2 ++
 src/empathy-debug-window.c                 |    2 ++
 src/empathy-map-view.c                     |    2 ++
 6 files changed, 12 insertions(+), 2 deletions(-)
---