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

[Guillaume Desmottes <gdesmott src gnome org>]

commit 884989d0837b2fa11905650ab098cd26c970edd7
Merge: ee4b8cc c5df89d
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Apr 5 15:25:55 2012 +0200

    Merge branch 'gnome-3-4'

 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --cc configure.ac
index 28bd0bb,588455e..7397f59
--- a/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])