[empathy] 3.12.0

[Guillaume Desmottes <gdesmott src gnome org>]

commit a3e844ffb8fa971ace5cc41842e4a7895221a0ac
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Mar 24 16:05:58 2014 +0100

    3.12.0

 NEWS         |    8 ++++++++
 configure.ac |    6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/NEWS b/NEWS
index 300e4b9..db09e5b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+NEW in 3.12.0 (24/03/2014)
+=============
+
+Translations:
+ - Updated da Translation (Kenneth Nielsen)
+ - Updated eu Translation (Inaki Larranaga Murgoitio)
+ - Updated pa Translation (A S Alam)
+
 NEW in 3.11.92 (17/03/2014)
 ==============
 
diff --git a/configure.ac b/configure.ac
index 01fce39..986a6ec 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], [92])
+m4_define([empathy_minor_version], [12])
+m4_define([empathy_micro_version], [0])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'