Merge branch 'gnome-3-4'

Conflicts:
	po/ca@valencia.po

diff --cc configure.ac
index 40a731a2b58fdbf740cc9cc35a1b6cebe3455acc,33bbf466aa5b77073c5d0088419a1f70cf29648d..9aab250b6542847706ad15df40b957d45475c335
--- 1/configure.ac
--- 2/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],

diff --cc src/empathy-roster-window.c
Simple merge

diff --cc src/empathy.c
Simple merge