Merge branch 'gnome-3-4'

diff --cc configure.ac
index a31c29c66def040a7daabd5c5049951661c7b902,2b5fb317cdbc200ef66fc0ba2668936aa9befd75..4a4a43ce73db1a7fb37b4e95c0abdf0ac6287ad9
--- 1/configure.ac
--- 2/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],

diff --cc src/empathy-accounts-dialog.c
Simple merge