From 41856adcd7395a3e7b68af67dbdc23d66c3c29f1 Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu, 31 Oct 2013 16:38:46 +0100
Subject: [PATCH] 3.11.1

---
 NEWS         | 39 +++++++++++++++++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 44c45fdb..df7468e6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,42 @@
+NEW in 3.11.1 (31/10/2013)
+=============
+
+Dependencies:
+ • GStreamer 1.0 is now mandatory as 0.10 support has been removed
+ • The nautilus-sendto plugin has been removed as latest nautilus-sendo
+   versions don't support plugins any more.
+
+Bugs fixed:
+ - Fixed #630896, Use tp-glib API for Chan.T.ServerTLSConnection and TLSCertificate (Guillaume Desmottes)
+ - Fixed #708897, Make Appdata file translatable (Daniel Mustieles)
+ - Fixed #710453, libgee memory leak fixes (Philip Withnall)
+
+Translations:
+ - Updated be Translation (Ihar Hrachyshka)
+ - Updated ca@valencia Translation (Carles Ferrando)
+ - Updated cs Translation (Marek Černocký)
+ - Updated el Translation (Efstathios Iosifidis)
+ - Updated es Translation (Daniel Mustieles)
+ - Updated fa Translation (Arash Mousavi)
+ - Updated gl Translation (Fran Diéguez)
+ - Updated hu Translation (Balázs Úr)
+ - Updated id Translation (Andika Triwidada)
+ - Updated it Translation (Milo Casagrande)
+ - Updated ja Translation (Jiro Matsuzawa)
+ - Updated lt Translation (Aurimas Černius)
+ - Updated lv Translation (RÅ«dolfs Mazurs)
+ - Updated nb Translation (Kjartan Maraas)
+ - Updated pl Translation (Piotr Drąg)
+ - Updated pt_BR Translation (Rafael Ferreira, Enrico Nicoletto)
+ - Updated pt Translation (António Lima)
+ - Updated ru Translation (Yuri Myasoedov)
+ - Updated sl Translation (Matej Urbančič)
+ - Updated sr@latin Translation (Мирослав Николић)
+ - Updated sr Translation (Мирослав Николић)
+
+Documentation translations:
+ - Updated lv Documentation translation (RÅ«dolfs Mazurs)
+
 NEW in 3.10.1 (14/10/2013)
 =============
 
diff --git a/configure.ac b/configure.ac
index 2ac9e582..8a05ada1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 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], [3])
-m4_define([empathy_minor_version], [10])
+m4_define([empathy_minor_version], [11])
 m4_define([empathy_micro_version], [1])
 m4_define([empathy_nano_version], [0])
 
-- 
2.39.2