[empathy/gnome-3-6] prepare 3.6.1

[Guillaume Desmottes <gdesmott src gnome org>]

commit 2733d55a3098365e2f8d614fbfe46971d7555f77
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Oct 15 17:21:17 2012 +0200

    prepare 3.6.1

 NEWS         |   13 +++++++++++++
 configure.ac |    6 +++---
 2 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/NEWS b/NEWS
index 22907b0..03893b3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+NEW in 3.6.1 (15/10/2012)
+============
+
+Translations:
+ - Updated da Translation (Ask H. Larsen)
+ - Updated en_GB Translation (Bruce Cowan)
+ - Updated hu Translation (Gabor Kelemen)
+ - Updated ko Translation (Changwoo Ryu)
+ - Updated mr Translation (Sandeep Sheshrao Shedmake)
+ - Updated nb Translation (Kjartan Maraas)
+ - Updated sk Translation (Pavol KlaÄanskÃ)
+ - Updated th Translation (Theppitak Karoonboonyanan)
+
 NEW in 3.6.0.3 (08/10/2012)
 ==============
 
diff --git a/configure.ac b/configure.ac
index 7f18603..212e6ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 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], [6])
-m4_define([empathy_micro_version], [0])
-m4_define([empathy_nano_version], [3])
+m4_define([empathy_micro_version], [1])
+m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
 m4_define([empathy_base_version],