[empathy/gnome-2-34] prepare 2.33.2

[Guillaume Desmottes <gdesmott src gnome org>]

commit 19e09cf12c8683ce09729aa673be4cc72d853c92
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Feb 24 17:18:06 2011 +0100

    prepare 2.33.2

 NEWS         |   37 +++++++++++++++++++++++++++++++++++++
 configure.ac |    4 ++--
 2 files changed, 39 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index a1a4a53..b487cbd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,40 @@
+NEW in 2.33.2 (24/02/2011)
+=============
+
+The â??happy birthday my love, now you can delete your logs^Wprevious
+conversationsâ?? release.
+
+Dependencies:
+ â?¢ telepathy-logger â?¥ 0.2.0
+ â?¢ folks â?¥ 0.3.5
+ â?¢ telepathy-glib â?¥ 0.13.12
+ â?¢ telepathy-farstream (optional)
+
+Empathy has been ported to latest telepathy-logger API and is now able to
+delete previous conversations.
+
+You can now block annoying contacts.
+
+This release also brings empathy-call, a new experimental handler for Call
+channels, our new audio/video API that is going to replace
+StreamedMedia channels.
+If you wish to test it, you'll need to install telepathy-farstream.
+This new handler can easily be disabled by passing --enable-call=no during the
+configure.
+
+Bugs fixed:
+ - Fixed #641861, Can't setup an irc server (Guillaume Desmottes)
+ - Fixed #642358, Empathy should check Reconnect_Required before calling Reconnect() (Guillaume Desmottes)
+ - Fixed #592595, Allow pinning contacts (showing them even when they are offline) (Guillaume Desmottes)
+ - Fixed #634679, Implement a channel factory (Guillaume Desmottes)
+ - Fixed #637151, Hide the user Individual from the contact list (Philip Withnall)
+ - Fixed #640723, Port 2.34 to Folks 0.3 (Philip Withnall)
+ - Fixed #641662, Update for libfolks API changes to IndividualAggregator.add_persona_from_details (Philip Withnall)
+ - Fixed #641985, connectivity: Uses old connman D-BUS names (Rob Bradford)
+ - Fixed #642296, Hitting Enter doesn't activate the "Enter password" dialog (Guillaume Desmottes)
+ - Fixed #642385, Incomplete list of servers and port numbers for Freenode (Debarshi Ray)
+ - Fixed #643186, Certificate dialog should disappear if the connection goes away (Guillaume Desmottes)
+
 NEW in 2.33.1 (02/02/2011)
 =============
 
diff --git a/configure.ac b/configure.ac
index d510981..16afb58 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], [2])
 m4_define([empathy_minor_version], [33])
-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'