prepare 2.91.5

diff --git a/NEWS b/NEWS
index 203191a4582d088b448454b64c1e02fbbc3debae..1d3617ec99d49358509185680c5ec0d7cd9c602f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,26 @@
+NEW in 2.91.5 (10/01/2011)
+=============
+
+The --with-ca-file configure option has been removed as certificates are now
+managed using gnome-keyring.
+
+Bugs fixed:
+ - Fixed #603027, "Manage favorites" dialog should skip accounts which don't support rooms (Chandni Verma)
+ - Fixed #636258, Certificate verification should use keyring (Stef Walter)
+ - Fixed #637195, File transfer window should let you double click to open a file (Kushal Das)
+ - Fixed #638040, avatar X filter adding is jumping throug hoops for now reason (Sjoerd Simons)
+ - Fixed #638041, Should highlight both the tab label and the tab menu label (Sjoerd Simons)
+
+Translations:
+ - Updated es Translation (Daniel Mustieles)
+ - Updated et Translation (Mattias Põldaru)
+ - Updated gl Translation (Fran Diéguez)
+ - Updated he Translation (Yaron Shahrabani)
+ - Updated nb Translation (Kjartan Maraas)
+ - Updated pa Translation (A S Alam)
+ - Updated sl Translation (Matej Urbančič)
+ - Updated sv Translation (Daniel Nylander)
+
 NEW in 2.91.4.3 (24/12/2010)
 ===============
 

diff --git a/configure.ac b/configure.ac
index 28040909bceeb61897ae5972ae05f8bd4a19bf0c..a7877285ce8f4d6b0890218c74a424049f57e20b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@ m4_define(empathy_released, 1)
 
 m4_define([empathy_major_version], [2])
 m4_define([empathy_minor_version], [91])
-m4_define([empathy_micro_version], [4])
-m4_define([empathy_nano_version], [3])
+m4_define([empathy_micro_version], [5])
+m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
 m4_define([empathy_base_version],