prepare 3.6.2

diff --git a/NEWS b/NEWS
index 03893b32240f18cc5cf30a3c352e00af23f372c9..501ad8b852544e9fb247ea3e26b2d8c2a6988bcd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,29 @@
+NEW in 3.6.2 (13/11/2012)
+============
+
+This stable release improves GNOME Online Account integration and fixes a
+bunch of call related bugs thanks to Debarshi Ray's awesome work.
+
+Bugs fixed:
+ - Fixed #687690, Support X-TELEPATHY-PASSWORD for GOA accounts (Debarshi Ray)
+ - Fixed #652546, Add X-GOOGLE-PLATFORM support (Giovanni Campagna)
+ - Fixed #687449, switch video input is sensitive even though I only have one camera (Debarshi Ray)
+ - Fixed #687762, Don't unref properties before creating the certificate (Debarshi Ray)
+ - Fixed #686314, Unref the list of FsElementAddedNotifiers on fs-conference-removed (Debarshi Ray)
+ - Fixed #686311, Tries to remove fsrtpconference element from wrong pipeline (Debarshi Ray)
+
+Translations:
+ - Updated de Translation (Tobias Endrigkeit)
+ - Updated et Translation (Mattias Põldaru)
+ - Updated fa Translation (Arash Mousavi)
+ - Updated ga Translation (Seán de Búrca)
+ - Updated gu Translation (Sweta Kothari)
+ - Updated kn Translation (Shankar Prasad)
+ - Updated nn Translation (Andreas N)
+ - Updated or Translation (ManojKumar Giri)
+ - Updated pa Translation (A S Alam)
+ - Updated pt_BR Translation (Rafael Ferreira)
+
 NEW in 3.6.1 (15/10/2012)
 ============
 

diff --git a/configure.ac b/configure.ac
index ccf9496bc5a1ecbce6ad3aed902d6c6abc5f2b69..dd2e8393b884e602a17b955746a308dc8e1b347b 100644 (file)
--- 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], [6])
-m4_define([empathy_micro_version], [1])
+m4_define([empathy_micro_version], [2])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'