prepare 2.91.6.1

diff --git a/NEWS b/NEWS
index 58c34cd41bfd098ac171e5b47cd1d8f2236c8b46..04fc1fee863b85db0c51ae7f1c5dc42ad06be216 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+NEW in 2.91.6.1 (01/02/2011)
+===============
+
+The "How many French speaking hackers do you need to fix a bug?" release.
+
+We finally managed to fix the very annoying bug making Empathy getting stuck in
+a memory eating infinite loop. \o/
+
+Bugs fixed:
+ - Fixed #635105, Empathy is eating all the memory (Guillaume Desmottes)
+

 NEW in 2.91.6 (01/02/2011)
 =============
 
 NEW in 2.91.6 (01/02/2011)
 =============
 

diff --git a/configure.ac b/configure.ac
index 9c4c12783676376714605e082cd9e6b0b9fdee44..e4c7fe11b9b6668e978c8bffd7b1b087098afff9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 dnl If not 1, append datestamp to the version number
 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], [2])
 m4_define([empathy_minor_version], [91])
 m4_define([empathy_micro_version], [6])
 
 m4_define([empathy_major_version], [2])
 m4_define([empathy_minor_version], [91])
 m4_define([empathy_micro_version], [6])

-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],
 
 dnl Display the nano_version only if it's not '0'
 m4_define([empathy_base_version],