[empathy: 6/6] Merge branch 'gnome-3-4'

[Guillaume Desmottes <gdesmott src gnome org>]

commit cf118e67c08e1d50b456a7127b0c879740d30e85
Merge: f86e7b5 beb1e9f
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Apr 5 13:31:59 2012 +0200

    Merge branch 'gnome-3-4'

 NEWS                                               |   49 ++++++++++++++++++++
 configure.ac                                       |    4 +-
 libempathy-gtk/empathy-chat.c                      |    3 +-
 .../empathy-local-xmpp-assistant-widget.c          |    7 +++
 .../empathy-local-xmpp-assistant-widget.h          |    3 +
 libempathy-gtk/empathy-log-window.c                |    1 -
 libempathy/empathy-contact.c                       |    2 -
 libempathy/empathy-contact.h                       |    2 +-
 libempathy/empathy-message.c                       |    5 --
 libempathy/empathy-message.h                       |    2 +-
 nautilus-sendto-plugin/empathy-nautilus-sendto.c   |    2 +-
 src/empathy-accounts-dialog.c                      |    4 +-
 src/empathy.c                                      |    2 +-
 13 files changed, 69 insertions(+), 17 deletions(-)
---
diff --cc configure.ac
index a31c29c,2b5fb31..4a4a43c
--- a/configure.ac
+++ b/configure.ac
@@@ -1,10 -1,10 +1,10 @@@
  dnl If not 1, append datestamp to the version number
- m4_define(empathy_released, 0)
+ m4_define(empathy_released, 1)
  
  m4_define([empathy_major_version], [3])
 -m4_define([empathy_minor_version], [4])
 +m4_define([empathy_minor_version], [5])
  m4_define([empathy_micro_version], [0])
- m4_define([empathy_nano_version], [0])
+ m4_define([empathy_nano_version], [1])
  
  dnl Display the nano_version only if it's not '0'
  m4_define([empathy_base_version],