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

[Guillaume Desmottes <gdesmott src gnome org>]

commit bb1cf54832b5c3b29744407de9189cd63af9c3c2
Merge: b8e7e16 25a167b
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Wed Apr 11 11:09:08 2012 +0200

    Merge branch 'gnome-3-4'
    
    Conflicts:
    	po/ca valencia po

 Makefile.am                 |    1 +
 NEWS                        |    6 +
 configure.ac                |    2 +-
 po/hi.po                    |  543 ++++++++++++++++++-------------------------
 src/empathy-roster-window.c |    1 +
 src/empathy.c               |    7 -
 6 files changed, 237 insertions(+), 323 deletions(-)
---
diff --cc configure.ac
index 40a731a,33bbf46..9aab250
--- a/configure.ac
+++ b/configure.ac
@@@ -2,9 -2,9 +2,9 @@@ dnl If not 1, append datestamp to the v
  m4_define(empathy_released, 0)
  
  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], [1])
 -m4_define([empathy_nano_version], [2])
++m4_define([empathy_nano_version], [0])
  
  dnl Display the nano_version only if it's not '0'
  m4_define([empathy_base_version],