Merge branch 'gnome-3-4'

diff --cc configure.ac
index 28bd0bb9de09d4e3552b2c3227deb31c49f22316,588455edb08358696674a85bf188207aecd94e24..7397f59b069ec6088d777793e1952d1bca8f8ee3
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1,8 -1,8 +1,8 @@@
  dnl If not 1, append datestamp to the version number
- m4_define(empathy_released, 1)
+ 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])