[empathy] 3.12.5

[Guillaume Desmottes <gdesmott src gnome org>]

commit fa90da82bb1eedc545f1189d4bbf5bb93d9fe3a3
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Wed Aug 20 14:53:12 2014 +0200

    3.12.5

 NEWS         |    9 +++++++++
 configure.ac |    4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index 10a8d28..d38aafc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+NEW in 3.12.5 (20/08/2014)
+=============
+
+Bugs fixed:
+ - Fixed #732909, chain GtkCombobox subclass constructors to parent (Frédéric Péters)
+
+Translations:
+ - Updated de Translation (Christian Kirbach)
+
 NEW in 3.12.4 (23/06/2014)
 =============
 
diff --git a/configure.ac b/configure.ac
index 9947307..229ae60 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], [12])
-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'