prepare 3.6.0

2 files changed, 62 insertions, 3 deletions

diff --git a/NEWS b/NEWS
index b3c2776fe..a366ef241 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,62 @@
+NEW in 3.6.0 (25/09/2012)
+============
+
+Here is the first release of the new stable 3.6 series. Not many code change
+since 3.5.92, most of of the credits goes to translators who did an amazing
+job localizing this new release.
+
+Bugs fixed:
+ - Fixed #674179, Port to GStreamer 0.11/1.0 (Sjoerd Simons)
+ - Fixed #684281, description in empathy.application should be translatable (Guillaume Desmottes)
+ - Fixed #684475, Potential infinite loop in migrate_account_to_uoa (Guillaume Desmottes)
+ - Fixed #684531, Mic is muted when recalling (Guillaume Desmottes)
+
+Translations:
+ - Updated ar Translation (Ibrahim Saed)
+ - Updated as Translation (Nilamdyuti Goswami)
+ - Updated be Translation (Ihar Hrachyshka)
+ - Updated bg Translation (Alexander Shopov)
+ - Updated ca Translation (Gil Forcada)
+ - Updated ca@valencia Translation (Carles Ferrando)
+ - Updated cs Translation (Marek Černocký)
+ - Updated de Translation (Mario Blättermann)
+ - Updated el Translation (Tom Tryfonidis)
+ - Updated en_GB Translation (Chris Leonard)
+ - Updated es Translation (Daniel Mustieles)
+ - Updated et Translation (Mattias Põldaru)
+ - Updated fr Translation (Alexandre Franke)
+ - Updated gl Translation (Fran Diéguez)
+ - Updated gu Translation (Sweta Kothari)
+ - Updated he Translation (Yaron Shahrabani)
+ - Updated hi Translation (Rajesh Ranjan)
+ - Updated hu Translation (Gabor Kelemen)
+ - Updated id Translation (Andika Triwidada)
+ - Updated it Translation (Milo Casagrande)
+ - Updated ja Translation (Jiro Matsuzawa, Noriko Mizumoto)
+ - Updated kn Translation (Shankar Prasad)
+ - Updated ko Translation (Changwoo Ryu)
+ - Updated lt Translation (Aurimas Černius)
+ - Updated lv Translation (Rūdolfs Mazurs)
+ - Updated ml Translation (Ani Peter)
+ - Updated mr Translation (Sandeep Sheshrao Shedmake)
+ - Updated or Translation (ManojKumar Giri)
+ - Updated pa Translation (A S Alam)
+ - Updated pl Translation (Piotr Drąg)
+ - Updated pt_BR Translation (Antonio Fernandes C. Neto, Rafael Ferreira)
+ - Updated pt Translation (Duarte Loreto)
+ - Updated ru Translation (Yuri Myasoedov)
+ - Updated sl Translation (Matej Urbančič)
+ - Updated sr@latin Translation (Мирослав Николић)
+ - Updated sr Translation (Мирослав Николић)
+ - Updated ta Translation (Dr.T.Vasudevan)
+ - Updated te Translation (Krishnababu Krothapalli)
+ - Updated th Translation (Theppitak Karoonboonyanan)
+ - Updated uk Translation (Daniel Korostil)
+ - Updated zh_CN Translation (Cheng Lu)
+
+Documentation translations:
+ - Updated el Documentation translation (Tom Tryfonidis)
+
 NEW in 3.5.92 (17/09/2012)
 =============
 
diff --git a/configure.ac b/configure.ac
index b6f92820e..43cf13eeb 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], [5])
-m4_define([empathy_micro_version], [92])
+m4_define([empathy_minor_version], [6])
+m4_define([empathy_micro_version], [0])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'