[empathy] 3.11.5

[Guillaume Desmottes <gdesmott src gnome org>]

commit c05fe49ca4c3f2ad444339ebe75dfcfde4a0d779
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Feb 3 12:00:15 2014 +0100

    3.11.5

 NEWS         |   15 +++++++++++++++
 configure.ac |    4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index 87b202e..3369c50 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,18 @@
+NEW in 3.11.5 (03/02/2014)
+=============
+
+Bugs fixed:
+ - Fixed #637316, Use the new license-type property in the about dialog (Emilio Pozuelo Monfort)
+
+Translations:
+ - Updated as Translation (Nilamdyuti Goswami)
+ - Updated he Translation (Yosef Or Boczko)
+ - Updated nb Translation (Kjartan Maraas)
+ - Updated sl Translation (Matej Urbančič)
+ - Updated tg Translation (Victor Ibragimov)
+ - Updated zh_HK Translation (Cheng-Chia Tseng)
+ - Updated zh_TW Translation (Cheng-Chia Tseng)
+
 NEW in 3.11.4 (20/01/2014)
 =============
 
diff --git a/configure.ac b/configure.ac
index c37434a..02320f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 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], [11])
-m4_define([empathy_micro_version], [4])
+m4_define([empathy_micro_version], [5])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'