From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed, 11 Apr 2012 09:09:08 +0000 (+0200)
Subject: Merge branch 'gnome-3-4'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=bb1cf54832b5c3b29744407de9189cd63af9c3c2

Merge branch 'gnome-3-4'

Conflicts:
	po/ca@valencia.po
---

bb1cf54832b5c3b29744407de9189cd63af9c3c2
diff --cc configure.ac
index 40a731a2,33bbf466..9aab250b
--- 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],